diff --git a/README.md b/README.md index 3fe0ee7..8960db3 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ Remi Cloud (瑞米) 是一款企业级AI+微服务架构的快速开发平台，

您的 Star 是对我们开源团队的最大肯定。

瑞米平台的设计理念：**所见即所得，极简且易用**。 我相信大家在使用过程中能体验到设计师的用心之处，**颜色的高对比度**、**左侧菜单的设计**、**减少了弹框的嵌套**、**三等分的抽屉使用**等，让用户体验更加友好。瑞米平台目前还在公测阶段，可能会些许不足，也请您给些包容并及时反馈给我们，24年年底我们定会按时交出让您满意的瑞米快速开发平台。 + ## 项目规划 diff --git a/docs/config/nacos/bootstrap.yml b/docs/config/nacos/bootstrap.yml deleted file mode 100644 index ec94460..0000000 --- a/docs/config/nacos/bootstrap.yml +++ /dev/null @@ -1,48 +0,0 @@ -# 服务端口号 -server: - port: 1010 - -spring: - application: - name: remi-sys-web - profiles: - active: dev - cloud: - # nacos - nacos: - # 注册中心 - username: nacos - password: nacos - discovery: - # 配置中心的地址 - server-addr: ${NACOS_HOST:192.168.31.88}:${NACOS_PORT:8848} - #命名空间 - namespace: ${SERVICE_NAME_SPACE_NAME:cloud} - # 配置文件的环境 - group: ${SERVICE_DISCOVERY_GROUP_NAME:dev} - # 配置中心 - config: - # 配置中心的地址 - server-addr: ${spring.cloud.nacos.discovery.server-addr} - #命名空间 - namespace: ${spring.cloud.nacos.discovery.namespace} - # 配置文件prefix - prefix: ${spring.application.name} - # 配置文件的环境 - group: ${spring.cloud.nacos.discovery.group} - # 配置文件的格式 - file-extension: yaml - # 配置的编码 - encode: UTF-8 - # 是否开启监听和自动刷新 - refresh-enabled: true - # 共享配置 - shared-configs: - # Data Id 的默认完整格式为： ${prefix}-${spring.profile.active}.${file-extension}。 - - dataId: cloud-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - group: ${spring.cloud.nacos.discovery.group} - #是否自动刷新 - refresh: true - - - diff --git a/docs/config/config/application-local.yml b/docs/envs/config/application-local.yml similarity index 69% rename from docs/config/config/application-local.yml rename to docs/envs/config/application-local.yml index 98a4666..aab5165 100644 --- a/docs/config/config/application-local.yml +++ b/docs/envs/config/application-local.yml @@ -10,10 +10,10 @@ spring: max-file-size: 100MB datasource: # mysql - url: jdbc:mysql://192.168.2.202:3306/remi-paas-ids?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.31.200:30636/dev-remi-boot?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&nullCatalogMeansCurrent=true driver-class-name: com.mysql.cj.jdbc.Driver username: root - password: Sdt@1020 + password: Remi@123 type: com.alibaba.druid.pool.DruidDataSource # 下面为连接池的补充设置，应用到上面所有数据源中 # 初始化大小，最小，最大 @@ -28,8 +28,6 @@ spring: min-evictable-idle-time-millis: 300000 # mysql validation-query: SELECT 1 FROM DUAL - # postgre - #validation-query: SELECT 1 test-while-idle: true test-on-borrow: false test-on-return: false @@ -43,37 +41,39 @@ spring: connect-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 redis: database: 0 - host: 192.168.2.202 - password: - port: 6379 + host: 192.168.31.200 + password: Remi@123 + port: 30210 jedis: pool: max-active: 8 max-idle: 8 min-idle: 0 timeout: 1000 -# MinIO -minio: - #对象存储服务的URL - url: http://192.168.2.202:9000 - #账户 - accessKey: admin - #密码 - secretKey: Sdt@1020 - #存储桶 - bucketName: remi-paas-ids + # 异步线程配置 async: executor: thread: # 核心线程数 - corePoolSize: 5 + corePoolSize: 10 # 最大线程数 - maxPoolSize: 20 + maxPoolSize: 30 # 任务队列大小 - queueCapacity: 1000 + queueCapacity: 3000 # 缓冲队列中线程的空闲时间 - keepAliveSeconds: 3000 + keepAliveSeconds: 300 + +# MinIO +minio: + #对象存储服务的URL + endpoint: http://192.168.31.200:30090 + #账户 + username: minioadmin + #密码 + password: minioadmin + #存储桶 + bucketName: dev-remi # 拦截器 sql-intercept: @@ -82,7 +82,7 @@ sql-intercept: enable: true companyTenant: enable: true - anonUrlSet: /user/getUserInfoByUserCode,/appInfo/list,/common/getUserInfo,/dept/getDeptByUserCode,/company/getCompanyInfoById,/operateLog/add,/operateLog/page,/operateLog/logPage + anonUrlSet: /sso/login/ticket,/sso/login/other,/sso/login/local,/sso/logout,/sso/oauth2/accessToken,/sso/oauth2/refreshToken,/sso/oauth2/checkToken,/logRecord/add,/logRecord/pageLogin,/logRecord/pageOperate,/logRecord/pageException,/logRecord/get field-fill: createdByIntercept: enable: true @@ -93,19 +93,9 @@ sql-intercept: updateAtIntercept: enable: true -## 开启店铺id 拦截器 -interceptor: - company: - enabled: true - # 开启系统操作日志 -log: +remi-log: record: enabled: true - pushUrl: http://localhost:6103/operateLog/add - appName: IDS - -# 日志输出路径配置 -logback: -# logDir: /Users/dianjiu/Logs/remi/remi-ids-web - logDir: D:\\Logs\\sdt\\paas\\remi-ids-web \ No newline at end of file + appName: remi-iam-web + pushUrl: http://192.168.31.18:1010/logRecord/add \ No newline at end of file diff --git a/docs/config/config/application.yml b/docs/envs/config/application.yml similarity index 68% rename from docs/config/config/application.yml rename to docs/envs/config/application.yml index 30bd75a..0917db8 100644 --- a/docs/config/config/application.yml +++ b/docs/envs/config/application.yml @@ -1,6 +1,6 @@ # 服务端口号 server: - port: 8081 + port: 8080 # tomcat 配置 tomcat: # tomcat的URI编码 @@ -12,7 +12,7 @@ server: spring: application: - name: remi-ids-web + name: remi-boot-web profiles: active: ${cfg.env} # 循环依赖的问题 @@ -29,7 +29,7 @@ mybatis-plus: #控制台打印完整带参数SQL语句 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #mapper映射文件路径 - mapper-locations: classpath*:/*-infra/src/main/resources/mapper/*.xml,classpath*:/common-log/src/main/resources/mapper/*.xml, classpath*:/mapper/**.xml + mapper-locations: classpath*:/*-infra/src/main/resources/mapper/*.xml, classpath*:/mapper/**.xml #pagehelper pagehelper: @@ -49,6 +49,8 @@ pagehelper: feign: okhttp: enabled: true + hystrix: + enabled: true sentinel: enabled: true client: @@ -57,44 +59,23 @@ feign: connectTimeout: 100000 readTimeout: 100000 -# knife4j配置 -knife4j: - #启用 - enable: true - #基础认证 - basic: - enable: false - username: remi - password: 123456 - #增强配置 - setting: - enableSwaggerModels: true - enableDocumentManage: true - enableHost: false - enableHostText: http://localhost - enableRequestCache: true - enableFilterMultipartApis: false - enableFilterMultipartApiMethodType: POST - language: zh-CN - enableFooter: false - enableFooterCustom: true - footerCustomContent: Copyright © 2021 Remi All Rights Reserved +# springdoc +springdoc: + group-configs: + - group: web + packages-to-scan: ai.remi.boot.web + - group: app + packages-to-scan: ai.remi.boot.app # 定义日志输出级别 logging: - config: classpath:logback-spring.xml level: - ai.remi: info - #spring 包日志输出级别 + com.startdis: debug + # spring 包日志输出级别 org.springframework: info + # alibaba 包日志输出级别 com.alibaba.cloud: info - # undertow - io.undertow: info + # nacos 心跳 INFO 屏蔽 + com.alibaba.nacos: off # mybatis-plus - com.baomidou.mybatisplus: debug - com.scm.scheduling.infra.mapper: debug - -# 日志配置 -logback: - appName: remi-ids-web - fileType: log + com.baomidou.mybatisplus: debug \ No newline at end of file diff --git a/docs/config/nacos/remi-sys-web-dev.yaml b/docs/envs/nacos/remi-boot-web-dev.yaml similarity index 72% rename from docs/config/nacos/remi-sys-web-dev.yaml rename to docs/envs/nacos/remi-boot-web-dev.yaml index 48f31b0..e93c12d 100644 --- a/docs/config/nacos/remi-sys-web-dev.yaml +++ b/docs/envs/nacos/remi-boot-web-dev.yaml @@ -1,6 +1,6 @@ spring: application: - name: remi-sys-web + name: remi-boot-web config: activate: on-profile: dev @@ -12,10 +12,10 @@ spring: max-file-size: 100MB datasource: # mysql - url: jdbc:mysql://192.168.31.66:3306/remi-saas-iam?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.31.200:30336/remi-boot?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&nullCatalogMeansCurrent=true driver-class-name: com.mysql.cj.jdbc.Driver username: root - password: 123456 + password: Remi@123 type: com.alibaba.druid.pool.DruidDataSource # 下面为连接池的补充设置，应用到上面所有数据源中 # 初始化大小，最小，最大 @@ -43,9 +43,9 @@ spring: connect-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 redis: database: 0 - host: 192.168.31.66 - password: ydsz1020 - port: 6379 + host: 192.168.31.200 + password: Remi@123 + port: 30120 jedis: pool: max-active: 8 @@ -66,16 +66,11 @@ async: # 缓冲队列中线程的空闲时间 keepAliveSeconds: 300 -# MinIO minio: - #对象存储服务的URL - url: http://192.168.31.88:9000 - #账户 - accessKey: admin - #密码 - secretKey: Sdt@1020~ - #存储桶 - bucketName: remi-paas-iam + endpoint: http://192.168.31.200:30900 + username: minioadmin + password: minioadmin + bucketName: remi # 拦截器 sql-intercept: @@ -84,7 +79,7 @@ sql-intercept: enable: true companyTenant: enable: true - anonUrlSet: /sso/login/ticket,/sso/login/other,/sso/login/local,/sso/logout,/sso/oauth2/accessToken,/sso/oauth2/refreshToken,/sso/oauth2/checkToken,/logRecord/add,/logRecord/pageLogin,/logRecord/pageOperate,/logRecord/pageException + anonUrlSet: /sso/login/ticket,/sso/login/other,/sso/login/local,/sso/logout,/sso/oauth2/accessToken,/sso/oauth2/refreshToken,/sso/oauth2/checkToken,/logRecord/add,/logRecord/pageLogin,/logRecord/pageOperate,/logRecord/pageException,/logRecord/get field-fill: createdByIntercept: enable: true @@ -94,29 +89,18 @@ sql-intercept: enable: true updateAtIntercept: enable: true -# springdoc-openapi项目配置 + +# springdoc springdoc: - #是否开启文档功能 group-configs: - - group: 'iam-web' - paths-to-match: '/**' - packages-to-scan: ai.remi.iam.web + - group: web + packages-to-scan: ai.remi.boot.web + - group: app + packages-to-scan: ai.remi.boot.app # 开启系统操作日志 -log: +remi-log: record: enabled: true - appName: IAM - pushUrl: http://localhost:6103/operateLog/add - -# 日志输出路径配置 -logback: - logDir: D:\Logs\sdt\cloud\${spring.application.name}\ - maxSize: 500MB - maxDays: 30 - -# 应用信息 -appInfo: - code: iam - key: kxxyuc46 - secret: f62b0078aa9b9bcc953b71d614fe999b \ No newline at end of file + appName: remi-sys-web + pushUrl: http://192.168.31.200:8080/logRecord/add \ No newline at end of file diff --git a/docs/config/nacos/remi-cloud-dev.yaml b/docs/envs/nacos/remi-cloud-dev.yaml similarity index 88% rename from docs/config/nacos/remi-cloud-dev.yaml rename to docs/envs/nacos/remi-cloud-dev.yaml index c09f550..25bcd8f 100644 --- a/docs/config/nacos/remi-cloud-dev.yaml +++ b/docs/envs/nacos/remi-cloud-dev.yaml @@ -9,6 +9,15 @@ server: # Tomcat启动初始化的线程数，默认值25 min-spare-threads: 30 +spring: + # 循环依赖的问题 + main: + allow-circular-references: true + # MVC默认的路径匹配策略为PATH_PATTERN_PARSER，需要修改为ANT_PATH_MATCHER 解决swagger兼容性问题 + mvc: + pathmatch: + matching-strategy: ANT_PATH_MATCHER + # mybatis-plus mybatis-plus: configuration: @@ -45,23 +54,10 @@ feign: connectTimeout: 100000 readTimeout: 100000 -# springdoc-openapi项目配置 -springdoc: - swagger-ui: - path: /swagger-ui.html - api-docs: - path: /v3/api-docs - -# knife4j的增强配置，不需要增强可以不配 -knife4j: - enable: true - setting: - language: zh-CN - # 定义日志输出级别 logging: level: - ai.remi: debug + com.startdis: debug # spring 包日志输出级别 org.springframework: info # alibaba 包日志输出级别 @@ -73,11 +69,6 @@ logging: # mybatis-plus com.baomidou.mybatisplus: debug -spring: - # 循环依赖的问题 - main: - allow-circular-references: true - # MVC默认的路径匹配策略为PATH_PATTERN_PARSER，需要修改为ANT_PATH_MATCHER 解决swagger兼容性问题 - mvc: - pathmatch: - matching-strategy: ANT_PATH_MATCHER \ No newline at end of file +# 日志输出路径配置 +logback: + logDir: D:\Logs\remi\cloud\${spring.application.name}\ \ No newline at end of file diff --git a/docs/envs/nacos/remi-demo-web-dev.yaml b/docs/envs/nacos/remi-demo-web-dev.yaml new file mode 100644 index 0000000..56d2369 --- /dev/null +++ b/docs/envs/nacos/remi-demo-web-dev.yaml @@ -0,0 +1,106 @@ +spring: + application: + name: remi-demo-web + config: + activate: + on-profile: dev + servlet: + multipart: + # 上传文件总的最大值 + max-request-size: 100MB + # 单个文件的最大值 + max-file-size: 100MB + datasource: + # mysql + url: jdbc:mysql://192.168.31.200:30336/remi-boot?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&nullCatalogMeansCurrent=true + driver-class-name: com.mysql.cj.jdbc.Driver + username: root + password: Remi@123 + type: com.alibaba.druid.pool.DruidDataSource + # 下面为连接池的补充设置，应用到上面所有数据源中 + # 初始化大小，最小，最大 + initial-size: 5 + min-idle: 5 + max-active: 20 + # 配置获取连接等待超时的时间 + max-wait: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + time-between-eviction-runs-millis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + min-evictable-idle-time-millis: 300000 + # mysql + validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + # 打开PSCache，并且指定每个连接上PSCache的大小 + pool-prepared-statements: true + # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 + max-pool-prepared-statement-per-connection-size: 20 + filters: stat,wall + use-global-data-source-stat: true + # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 + connect-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 + redis: + database: 0 + host: 192.168.31.200 + password: Remi@123 + port: 30120 + jedis: + pool: + max-active: 8 + max-idle: 8 + min-idle: 0 + timeout: 1000 + +# 异步线程配置 +async: + executor: + thread: + # 核心线程数 + corePoolSize: 10 + # 最大线程数 + maxPoolSize: 30 + # 任务队列大小 + queueCapacity: 3000 + # 缓冲队列中线程的空闲时间 + keepAliveSeconds: 300 + +minio: + endpoint: http://192.168.31.200:30900 + username: minioadmin + password: minioadmin + bucketName: remi + +# 拦截器 +sql-intercept: + tenant: + deptTenant: + enable: true + companyTenant: + enable: true + anonUrlSet: /sso/login/ticket,/sso/login/other,/sso/login/local,/sso/logout,/sso/oauth2/accessToken,/sso/oauth2/refreshToken,/sso/oauth2/checkToken,/logRecord/add,/logRecord/pageLogin,/logRecord/pageOperate,/logRecord/pageException,/logRecord/get + field-fill: + createdByIntercept: + enable: true + updateByIntercept: + enable: true + createAtIntercept: + enable: true + updateAtIntercept: + enable: true + +# springdoc +springdoc: + group-configs: + - group: web + packages-to-scan: ai.remi.demo.web + - group: app + packages-to-scan: ai.remi.demo.app + +# 开启系统操作日志 +remi-log: + record: + enabled: true + appName: remi-sys-web + pushUrl: http://192.168.31.200:8080/logRecord/add \ No newline at end of file diff --git a/docs/generator/EasyCodeConfig.json b/docs/generator/EasyCodeConfig.json deleted file mode 100644 index d5079bb..0000000 --- a/docs/generator/EasyCodeConfig.json +++ /dev/null @@ -1,139 +0,0 @@ -{ - "author" : "dianjiu", - "version" : "1.2.8", - "userSecure" : "", - "currTypeMapperGroupName" : "Default", - "currTemplateGroupName" : "Remi", - "currColumnConfigGroupName" : "Default", - "currGlobalConfigGroupName" : "Default", - "typeMapper" : { - "Default" : { - "name" : "Default", - "elementList" : [ { - "matchType" : "REGEX", - "columnType" : "varchar(\\(\\d+\\))?", - "javaType" : "java.lang.String" - }, { - "matchType" : "REGEX", - "columnType" : "char(\\(\\d+\\))?", - "javaType" : "java.lang.String" - }, { - "matchType" : "REGEX", - "columnType" : "(tiny|medium|long)*text", - "javaType" : "java.lang.String" - }, { - "matchType" : "REGEX", - "columnType" : "decimal(\\(\\d+,\\d+\\))?", - "javaType" : "java.math.BigDecimal" - }, { - "matchType" : "ORDINARY", - "columnType" : "integer", - "javaType" : "java.lang.Integer" - }, { - "matchType" : "REGEX", - "columnType" : "(tiny|small|medium)*int(\\(\\d+\\))?", - "javaType" : "java.lang.Integer" - }, { - "matchType" : "ORDINARY", - "columnType" : "int4", - "javaType" : "java.lang.Integer" - }, { - "matchType" : "ORDINARY", - "columnType" : "int8", - "javaType" : "java.lang.Long" - }, { - "matchType" : "REGEX", - "columnType" : "bigint(\\(\\d+\\))?", - "javaType" : "java.lang.Long" - }, { - "matchType" : "ORDINARY", - "columnType" : "date", - "javaType" : "java.time.LocalDateTime" - }, { - "matchType" : "ORDINARY", - "columnType" : "datetime", - "javaType" : "java.time.LocalDateTime" - }, { - "matchType" : "ORDINARY", - "columnType" : "timestamp", - "javaType" : "java.time.LocalDateTime" - }, { - "matchType" : "ORDINARY", - "columnType" : "time", - "javaType" : "java.time.LocalDateTime" - }, { - "matchType" : "ORDINARY", - "columnType" : "boolean", - "javaType" : "java.lang.Boolean" - } ] - } - }, - "template" : { - "Remi" : { - "name" : "Remi", - "elementList" : [ { - "name" : "converter.java.vm", - "code" : "##引入宏定义\n$!{init.vm}\n$!{define.vm}\n\n##使用宏定义设置回调（保存位置与文件后缀）\n#save(\"/converter\", \"Converter.java\")\n\n##使用宏定义设置包后缀\n#setPackageSuffix(\"converter\")\n\n##使用全局变量实现默认包导入\n$!autoImport\nimport org.mapstruct.Mapper;\nimport org.mapstruct.Mapping;\nimport org.mapstruct.factory.Mappers;\n\n/**\n * @author DianJiu\n * @email dianjiuxyz@gmail.com\n * @desc $!{tableInfo.comment} $!{tableInfo.name}Converter转换接口\n */\n@Mapper\npublic interface $!{tableInfo.name}Converter {\n\n public static $!{tableInfo.name}Converter INSTANT = Mappers.getMapper($!{tableInfo.name}Converter.class);\n\n @Mapping(target = \"id\", ignore = true)\n @Mapping(target = \"deleted\", ignore = true)\n @Mapping(target = \"revision\", ignore = true)\n @Mapping(target = \"deptTenantId\", ignore = true)\n @Mapping(target = \"companyTenantId\", ignore = true)\n @Mapping(target = \"createdBy\", ignore = true)\n @Mapping(target = \"createdAt\", ignore = true)\n @Mapping(target = \"updatedBy\", ignore = true)\n @Mapping(target = \"updatedAt\", ignore = true)\n $!{tableInfo.name} postDtoToEntity($!{tableInfo.name}PostDTO $!tool.firstLowerCase($tableInfo.name)DTO);\n \n @Mapping(target = \"deleted\", ignore = true)\n @Mapping(target = \"revision\", ignore = true)\n @Mapping(target = \"deptTenantId\", ignore = true)\n @Mapping(target = \"companyTenantId\", ignore = true)\n @Mapping(target = \"createdBy\", ignore = true)\n @Mapping(target = \"createdAt\", ignore = true)\n @Mapping(target = \"updatedBy\", ignore = true)\n @Mapping(target = \"updatedAt\", ignore = true)\n $!{tableInfo.name} putDtoToEntity($!{tableInfo.name}PutDTO $!tool.firstLowerCase($tableInfo.name)DTO);\n \n @Mapping(target = \"deleted\", ignore = true)\n @Mapping(target = \"revision\", ignore = true)\n @Mapping(target = \"deptTenantId\", ignore = true)\n @Mapping(target = \"companyTenantId\", ignore = true)\n @Mapping(target = \"createdBy\", ignore = true)\n @Mapping(target = \"createdAt\", ignore = true)\n @Mapping(target = \"updatedBy\", ignore = true)\n @Mapping(target = \"updatedAt\", ignore = true)\n $!{tableInfo.name} queryToEntity($!{tableInfo.name}Query $!tool.firstLowerCase($tableInfo.name)Query);\n \n $!{tableInfo.name}VO entityToVO($!{tableInfo.name} $!tool.firstLowerCase($tableInfo.name));\n \n}" - }, { - "name" : "entity.java.vm", - "code" : "##引入宏定义\n$!{init.vm}\n$!{define.vm}\n\n##使用宏定义设置回调（保存位置与文件后缀）\n#save(\"/entity\", \".java\")\n\n##使用宏定义设置包后缀\n#setPackageSuffix(\"entity\")\n\n##使用全局变量实现默认包导入\n$!autoImport\nimport java.io.Serializable;\nimport com.baomidou.mybatisplus.extension.activerecord.Model;\nimport lombok.Data;\nimport lombok.AllArgsConstructor;\nimport lombok.NoArgsConstructor;\nimport lombok.Builder;\n\n/**\n * @author DianJiu\n * @email dianjiuxyz@gmail.com\n * @desc $!{tableInfo.comment} $!{tableInfo.name}DTO对象\n */\n@Data\n@SuperBuilder\n@AllArgsConstructor\n@NoArgsConstructor\n@TableName(\"$tableInfo.obj.name\")\npublic class $!{tableInfo.name} extends BaseEntity {\n#foreach($column in $tableInfo.fullColumn)\n\n #if(!$column.name.equals(\"id\") && !$column.name.equals(\"deleted\") && !$column.name.equals(\"revision\") && !$column.name.equals(\"deptTenantId\") && !$column.name.equals(\"companyTenantId\") && !$column.name.equals(\"createdBy\") && !$column.name.equals(\"createdAt\") && !$column.name.equals(\"updatedBy\") && !$column.name.equals(\"updatedAt\"))\n #if(${column.comment})/**\n * ${column.comment}\n */#end\n private $!{tool.getClsNameByFullName($column.type)} $!{column.name};\n #end\n#end\n\n}" - }, { - "name" : "query.java.vm", - "code" : "##引入宏定义\n$!{init.vm}\n$!{define.vm}\n\n##使用宏定义设置回调（保存位置与文件后缀）\n#save(\"/query\", \"Query.java\")\n\n##使用宏定义设置包后缀\n#setPackageSuffix(\"query\")\n\n##使用全局变量实现默认包导入\n$!autoImport\nimport io.swagger.v3.oas.annotations.media.Schema;\nimport lombok.*;\n\nimport java.io.Serializable;\nimport java.math.BigDecimal;\n\n/**\n * @author DianJiu\n * @email dianjiuxyz@gmail.com\n * @desc $!{tableInfo.comment} $!{tableInfo.name}Query对象\n */\n@Data\n@Builder\n@AllArgsConstructor\n@NoArgsConstructor\n@ToString(callSuper = true)\n@Schema(description = \"$!{tableInfo.comment}\")\npublic class $!{tableInfo.name}Query implements Serializable {\n private static final long serialVersionUID = $!tool.serial();\n#foreach($column in $tableInfo.fullColumn)\n #if(!$column.name.equals(\"deleted\") && !$column.name.equals(\"revision\") && !$column.name.equals(\"deptTenantId\") && !$column.name.equals(\"companyTenantId\") && !$column.name.equals(\"createdBy\") && !$column.name.equals(\"createdAt\") && !$column.name.equals(\"updatedBy\") && !$column.name.equals(\"updatedAt\"))\n #if(${column.comment})/**\n * ${column.comment}\n */#end\n #if($column.type.equals(\"java.time.LocalDateTime\"))\n @DateTimeFormat(pattern=\"yyyy-MM-dd HH:mm:ss\")\n @JsonFormat(pattern = \"yyyy-MM-dd HH:mm:ss\", timezone = \"GMT+8\")\n #end\n @Schema(description = \"$column.comment\")\n private $!{tool.getClsNameByFullName($column.type)} $!{column.name};\n #end\n#end\n\n}\n" - }, { - "name" : "vo.java.vm", - "code" : "##引入宏定义\n$!{init.vm}\n$!{define.vm}\n\n##使用宏定义设置回调（保存位置与文件后缀）\n#save(\"/vo\", \"VO.java\")\n\n##使用宏定义设置包后缀\n#setPackageSuffix(\"vo\")\n\n##使用全局变量实现默认包导入\n$!{autoImport.vm}\nimport com.fasterxml.jackson.annotation.JsonFormat;\nimport io.swagger.v3.oas.annotations.media.Schema;\nimport lombok.*;\nimport org.springframework.format.annotation.DateTimeFormat;\n\nimport java.io.Serializable;\nimport java.math.BigDecimal;\nimport java.time.LocalDateTime;\n\n/**\n * @author DianJiu\n * @email dianjiuxyz@gmail.com\n * @desc $!{tableInfo.comment} $!{tableInfo.name}VO对象\n */\n@Data\n@Builder\n@AllArgsConstructor\n@NoArgsConstructor\n@ToString(callSuper = true)\n@Schema(description = \"$!{tableInfo.comment}\")\npublic class $!{tableInfo.name}VO implements Serializable {\n private static final long serialVersionUID = $!tool.serial();\n#foreach($column in $tableInfo.fullColumn)\n #if(${column.comment})/**\n * ${column.comment}\n */#end\n #if($column.type.equals(\"java.time.LocalDateTime\"))\n @DateTimeFormat(pattern=\"yyyy-MM-dd HH:mm:ss\")\n @JsonFormat(pattern = \"yyyy-MM-dd HH:mm:ss\", timezone = \"GMT+8\")\n #end\n @Schema(description = \"$column.comment\")\n private $!{tool.getClsNameByFullName($column.type)} $!{column.name};\n#end\n\n}" - }, { - "name" : "putdto.java.vm", - "code" : "##引入宏定义\n$!{init.vm}\n$!{define.vm}\n\n##使用宏定义设置回调（保存位置与文件后缀）\n#save(\"/dto/put\", \"PutDTO.java\")\n\n##使用宏定义设置包后缀\n#setPackageSuffix(\"dto.put\")\n\n##使用全局变量实现默认包导入\n$!autoImport\nimport io.swagger.v3.oas.annotations.media.Schema;\nimport lombok.*;\n\nimport java.io.Serializable;\nimport java.math.BigDecimal;\n\n/**\n * @author DianJiu\n * @email dianjiuxyz@gmail.com\n * @desc $!{tableInfo.comment} $!{tableInfo.name}DTO对象\n */\n@Data\n@Builder\n@AllArgsConstructor\n@NoArgsConstructor\n@ToString(callSuper = true)\n@Schema(description = \"$!{tableInfo.comment}\")\npublic class $!{tableInfo.name}PutDTO implements Serializable {\n private static final long serialVersionUID = $!tool.serial();\n#foreach($column in $tableInfo.fullColumn)\n\n #if(!$column.name.equals(\"deleted\") && !$column.name.equals(\"revision\") && !$column.name.equals(\"deptTenantId\") && !$column.name.equals(\"companyTenantId\") && !$column.name.equals(\"createdBy\") && !$column.name.equals(\"createdAt\") && !$column.name.equals(\"updatedBy\") && !$column.name.equals(\"updatedAt\"))\n #if(${column.comment})/**\n * ${column.comment}\n */#end\n #if($column.type.equals(\"java.time.LocalDateTime\"))\n @DateTimeFormat(pattern=\"yyyy-MM-dd HH:mm:ss\")\n @JsonFormat(pattern = \"yyyy-MM-dd HH:mm:ss\", timezone = \"GMT+8\")\n #end\n @Schema(description = \"$column.comment\")\n private $!{tool.getClsNameByFullName($column.type)} $!{column.name};\n #end\n#end\n\n}" - }, { - "name" : "postdto.java.vm", - "code" : "##引入宏定义\n$!{init.vm}\n$!{define.vm}\n\n##使用宏定义设置回调（保存位置与文件后缀）\n#save(\"/dto/post\", \"PostDTO.java\")\n\n##使用宏定义设置包后缀\n#setPackageSuffix(\"dto.post\")\n\n##使用全局变量实现默认包导入\n$!autoImport\nimport io.swagger.v3.oas.annotations.media.Schema;\nimport lombok.*;\n\nimport java.io.Serializable;\nimport java.math.BigDecimal;\n\n/**\n * @author DianJiu\n * @email dianjiuxyz@gmail.com\n * @desc $!{tableInfo.comment} $!{tableInfo.name}DTO对象\n */\n@Data\n@Builder\n@AllArgsConstructor\n@NoArgsConstructor\n@ToString(callSuper = true)\n@Schema(description = \"$!{tableInfo.comment}\")\npublic class $!{tableInfo.name}PostDTO implements Serializable {\n private static final long serialVersionUID = $!tool.serial();\n#foreach($column in $tableInfo.fullColumn)\n\n #if(!$column.name.equals(\"id\") && !$column.name.equals(\"deleted\") && !$column.name.equals(\"revision\") && !$column.name.equals(\"deptTenantId\") && !$column.name.equals(\"companyTenantId\") && !$column.name.equals(\"createdBy\") && !$column.name.equals(\"createdAt\") && !$column.name.equals(\"updatedBy\") && !$column.name.equals(\"updatedAt\"))\n #if(${column.comment})/**\n * ${column.comment}\n */#end\n #if($column.type.equals(\"java.time.LocalDateTime\"))\n @DateTimeFormat(pattern=\"yyyy-MM-dd HH:mm:ss\")\n @JsonFormat(pattern = \"yyyy-MM-dd HH:mm:ss\", timezone = \"GMT+8\")\n #end\n @Schema(description = \"$column.comment\")\n private $!{tool.getClsNameByFullName($column.type)} $!{column.name};\n #end\n#end\n\n}" - }, { - "name" : "controller.java.vm", - "code" : "##导入宏定义\n$!{init.vm}\n$!{define.vm}\n\n##设置表后缀（宏定义）\n#setTableSuffix(\"Controller\")\n\n##保存文件（宏定义）\n#save(\"/controller\", \"Controller.java\")\n\n##包路径（宏定义）\n#setPackageSuffix(\"controller\")\n\n##定义服务名\n#set($serviceName = $!tool.append($!tool.firstLowerCase($!tableInfo.name), \"Service\"))\n\n##定义实体对象名\n#set($entityName = $!tool.firstLowerCase($!tableInfo.name))\n\nimport com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;\nimport com.baomidou.mybatisplus.extension.api.ApiController;\nimport com.baomidou.mybatisplus.extension.plugins.pagination.Page;\nimport org.springframework.web.bind.annotation.*;\n\nimport javax.annotation.Resource;\nimport javax.validation.constraints.NotBlank;\nimport java.util.List;\n\n##表注释（宏定义）\n/**\n * @author DianJiu\n * @email dianjiuxyz@gmail.com\n * @desc $!{tableInfo.comment}($!{tableInfo.name})控制层\n */\n@Validated\n@RestController\n@ApiSort(value = 1)\n@Tag(name = \"$!{tableInfo.comment}\")\n@RequestMapping(\"$!tool.firstLowerCase($!tableInfo.name)\")\npublic class $!{tableName} {\n /**\n * 服务对象\n */\n @Resource\n private $!{tableInfo.name}Service $!{serviceName};\n\n \n /**\n * 通过主键查询单条数据\n *\n * @param id 主键\n * @return 单条数据\n */\n @GetMapping(\"{id}\")\n @Operation(summary = \"查询单条\")\n public ResultBean<$!{tableInfo.name}VO> get(@PathVariable @Validated @NotBlank(message = \"ID不能为空\") String id) {\n $!{tableInfo.name} $!{tool.firstLowerCase($!{tableInfo.name})} = $!{tool.firstLowerCase($tableInfo.name)}Service.getById(id);\n //处理格式转换\n $!{tableInfo.name}VO $!{tool.firstLowerCase($!{tableInfo.name})}VO = $!{tableInfo.name}Converter.INSTANT.entityToVO($!tool.firstLowerCase($!{tableInfo.name}));\n return ResultBean.success($!{tool.firstLowerCase($!{tableInfo.name})}VO);\n }\n \n /**\n * 通过实体不为空的属性作为筛选条件查询对象列表\n *\n * @param $!tool.firstLowerCase($tableInfo.name)Query 实例对象\n * @return 对象列表\n */\n @PostMapping(value = \"/list\")\n @Operation(summary = \"查询所有\")\n public ResultBean> list(@RequestBody $!{tableInfo.name}Query $!tool.firstLowerCase($tableInfo.name)Query) { \n //处理格式转换\n $!{tableInfo.name} $!{tool.firstLowerCase($!{tableInfo.name})} = $!{tableInfo.name}Converter.INSTANT.queryToEntity($!tool.firstLowerCase($tableInfo.name)Query);\n //执行分页查询\n List<$!{tableInfo.name}> listResult = $!{tool.firstLowerCase($tableInfo.name)}Service.list(new QueryWrapper<>($!{tool.firstLowerCase($!{tableInfo.name})}));\n return ResultBean.success(BeanCopyUtils.coverList(listResult, $!{tableInfo.name}VO.class));\n }\n \n /**\n * 分页查询所有数据\n *\n * @param pageQuery 分页对象\n * @param $!tool.firstLowerCase($!{tableInfo.name})Query 查询实体\n * @return 分页对象\n */\n @PostMapping(value = \"/page\")\n @Operation(summary = \"分页查询\")\n public ResultBean> page(PageQuery pageQuery,$!{tableInfo.name}Query $!tool.firstLowerCase($tableInfo.name)Query) {\n //处理分页条件\n Page<$!tableInfo.name> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());\n //处理格式转换\n $!{tableInfo.name} $!{tool.firstLowerCase($!{tableInfo.name})} = $!{tableInfo.name}Converter.INSTANT.queryToEntity($!tool.firstLowerCase($tableInfo.name)Query);\n //执行分页查询\n Page<$!{tableInfo.name}> pageResult = $!{tool.firstLowerCase($tableInfo.name)}Service.page(page, new QueryWrapper<>($!{tool.firstLowerCase($!{tableInfo.name})}));\n PagerBean<$!{tableInfo.name}VO> pageBean = new PagerBean<>(pageResult.getTotal(), pageResult.getCurrent(),\n pageResult.getSize(), BeanCopyUtils.coverList(pageResult.getRecords(), $!{tableInfo.name}VO.class));\n return ResultBean.success(pageBean);\n }\n\n /**\n * 新增数据\n *\n * @param $!tool.firstLowerCase($tableInfo.name)DTO 实体对象\n * @return 新增结果\n */\n @PostMapping(\"/add\")\n @Operation(summary = \"新增数据\")\n public ResultBean insert(@RequestBody @Validated $!{tableInfo.name}PostDTO $!tool.firstLowerCase($tableInfo.name)DTO) {\n //处理格式转换\n $!{tableInfo.name} $!{tool.firstLowerCase($!{tableInfo.name})} = $!{tableInfo.name}Converter.INSTANT.postDtoToEntity($!tool.firstLowerCase($tableInfo.name)DTO);\n //执行数据保存\n return ResultBean.success($!{tool.firstLowerCase($tableInfo.name)}Service.save($!{tool.firstLowerCase($!{tableInfo.name})}));\n }\n\n /**\n * 修改数据\n *\n * @param $!tool.firstLowerCase($tableInfo.name)DTO 实体对象\n * @return 修改结果\n */\n @PutMapping(\"/update\")\n @Operation(summary = \"修改数据\")\n public ResultBean update(@RequestBody @Validated $!{tableInfo.name}PutDTO $!tool.firstLowerCase($tableInfo.name)DTO) {\n //处理格式转换\n $!{tableInfo.name} $!{tool.firstLowerCase($!{tableInfo.name})} = $!{tableInfo.name}Converter.INSTANT.putDtoToEntity($!tool.firstLowerCase($tableInfo.name)DTO);\n //执行数据更新\n return ResultBean.success($!{tool.firstLowerCase($tableInfo.name)}Service.updateById($!{tool.firstLowerCase($!{tableInfo.name})}));\n }\n\n /**\n * 删除数据\n *\n * @param ids 主键结合\n * @return 删除结果\n */\n @DeleteMapping(\"/delete\")\n @Operation(summary = \"删除数据\")\n public ResultBean delete(@RequestParam(\"ids\") List ids) {\n return ResultBean.success($!{tool.firstLowerCase($tableInfo.name)}Service.removeByIds(ids));\n } \n\n}\n" - }, { - "name" : "service.java.vm", - "code" : "##导入宏定义\n$!{init.vm}\n$!{define.vm}\n\n##设置表后缀（宏定义）\n#setTableSuffix(\"Service\")\n\n##保存文件（宏定义）\n#save(\"/service\", \"Service.java\")\n\n##包路径（宏定义）\n#setPackageSuffix(\"service\")\n\nimport com.baomidou.mybatisplus.extension.service.IService;\n\n##表注释（宏定义）\n/**\n * @author DianJiu\n * @email dianjiuxyz@gmail.com\n * @desc $!{tableInfo.comment}($!{tableInfo.name})服务定义层\n */\npublic interface $!{tableName} extends IService<$!tableInfo.name> {\n\n}" - }, { - "name" : "serviceimpl.java.vm", - "code" : "##导入宏定义\n$!{init.vm}\n$!{define.vm}\n\n##设置表后缀（宏定义）\n#setTableSuffix(\"ServiceImpl\")\n\n##保存文件（宏定义）\n#save(\"/service/impl\", \"ServiceImpl.java\")\n\n##包路径（宏定义）\n#setPackageSuffix(\"service.impl\")\n\nimport com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;\nimport $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;\nimport org.springframework.stereotype.Service;\n\n##表注释（宏定义）\n/**\n * @author DianJiu\n * @email dianjiuxyz@gmail.com\n * @desc $!{tableInfo.comment}($!{tableInfo.name})服务实现层\n */\n@Service(\"$!tool.firstLowerCase($tableInfo.name)Service\")\npublic class $!{tableName} extends ServiceImpl<$!{tableInfo.name}Mapper, $!{tableInfo.name}> implements $!{tableInfo.name}Service {\n\n}\n" - }, { - "name" : "mapper.java.vm", - "code" : "##导入宏定义\n$!{init.vm}\n$!{define.vm}\n\n##设置表后缀（宏定义）\n#setTableSuffix(\"Mapper\")\n\n##保存文件（宏定义）\n#save(\"/mapper\", \"Mapper.java\")\n\n##包路径（宏定义）\n#setPackageSuffix(\"mapper\")\nimport org.apache.ibatis.annotations.Mapper;\n\nimport com.baomidou.mybatisplus.core.mapper.BaseMapper;\n\n##表注释（宏定义）\n/**\n * @author DianJiu\n * @email dianjiuxyz@gmail.com\n * @desc $!{tableInfo.comment}($!{tableInfo.name})数据层\n */\n@Mapper\npublic interface $!{tableName} extends BaseMapper<$!tableInfo.name> {\n\n}" - } ] - } - }, - "columnConfig" : { - "Default" : { - "name" : "Default", - "elementList" : [ { - "title" : "disable", - "type" : "BOOLEAN", - "selectValue" : "" - }, { - "title" : "support", - "type" : "SELECT", - "selectValue" : "add,edit,query,del,ui" - } ] - } - }, - "globalConfig" : { - "Default" : { - "name" : "Default", - "elementList" : [ { - "name" : "autoImport.vm", - "value" : "##自动导入包（仅导入实体属性需要的包，通常用于实体类）\n#foreach($import in $importList)\nimport $!import;\n#end" - }, { - "name" : "define.vm", - "value" : "##（Velocity宏定义）\n\n##定义设置表名后缀的宏定义，调用方式：#setTableSuffix(\"Test\")\n#macro(setTableSuffix $suffix)\n #set($tableName = $!tool.append($tableInfo.name, $suffix))\n#end\n\n##定义设置包名后缀的宏定义，调用方式：#setPackageSuffix(\"Test\")\n#macro(setPackageSuffix $suffix)\n#if($suffix!=\"\")package #end#if($tableInfo.savePackageName!=\"\")$!{tableInfo.savePackageName}.#{end}$!suffix;\n#end\n\n##定义直接保存路径与文件名简化的宏定义，调用方式：#save(\"/entity\", \".java\")\n#macro(save $path $fileName)\n $!callback.setSavePath($tool.append($tableInfo.savePath, $path))\n $!callback.setFileName($tool.append($tableInfo.name, $fileName))\n#end\n\n##定义表注释的宏定义，调用方式：#tableComment(\"注释信息\")\n#macro(tableComment $desc)\n/**\n * $!{tableInfo.comment}($!{tableInfo.name})$desc\n *\n * @author $!author\n * @since $!time.currTime()\n */\n#end\n\n##定义GET，SET方法的宏定义，调用方式：#getSetMethod($column)\n#macro(getSetMethod $column)\n\n public $!{tool.getClsNameByFullName($column.type)} get$!{tool.firstUpperCase($column.name)}() {\n return $!{column.name};\n }\n\n public void set$!{tool.firstUpperCase($column.name)}($!{tool.getClsNameByFullName($column.type)} $!{column.name}) {\n this.$!{column.name} = $!{column.name};\n }\n#end" - }, { - "name" : "init.vm", - "value" : "##初始化区域\n\n##去掉表的sdt_前缀\n#if($tableInfo.obj.name.startsWith(\"sdt_\"))\n $!tableInfo.setName($tool.getClassName($tableInfo.obj.name.substring(4)))\n#end\n\n##去掉表的ids_前缀\n#if($tableInfo.obj.name.startsWith(\"ids_\"))\n $!tableInfo.setName($tool.getClassName($tableInfo.obj.name.substring(4)))\n#end\n\n##去掉表的ams_前缀\n#if($tableInfo.obj.name.startsWith(\"ams_\"))\n $!tableInfo.setName($tool.getClassName($tableInfo.obj.name.substring(4)))\n#end\n\n##去掉表的mps_前缀\n#if($tableInfo.obj.name.startsWith(\"mps_\"))\n $!tableInfo.setName($tool.getClassName($tableInfo.obj.name.substring(4)))\n#end\n\n##去掉表的mps_前缀\n#if($tableInfo.obj.name.startsWith(\"sys_\"))\n $!tableInfo.setName($tool.getClassName($tableInfo.obj.name.substring(4)))\n#end\n\n##去掉表的cms_前缀\n#if($tableInfo.obj.name.startsWith(\"cms_\"))\n $!tableInfo.setName($tool.getClassName($tableInfo.obj.name.substring(4)))\n#end\n\n##参考阿里巴巴开发手册，POJO 类中布尔类型的变量，都不要加 is 前缀，否则部分框架解析会引起序列化错误\n#foreach($column in $tableInfo.fullColumn)\n#if($column.name.startsWith(\"is\") && $column.type.equals(\"java.lang.Boolean\"))\n $!column.setName($tool.firstLowerCase($column.name.substring(2)))\n#end\n#end\n\n##实现动态排除列\n#set($temp = $tool.newHashSet(\"testCreateTime\", \"otherColumn\"))\n#foreach($item in $temp)\n #set($newList = $tool.newArrayList())\n #foreach($column in $tableInfo.fullColumn)\n #if($column.name!=$item)\n ##带有反回值的方法调用时使用$tool.call来消除返回值\n $tool.call($newList.add($column))\n #end\n #end\n ##重新保存\n $tableInfo.setFullColumn($newList)\n#end\n\n##对importList进行篡改\n#set($temp = $tool.newHashSet())\n#foreach($column in $tableInfo.fullColumn)\n #if(!$column.type.startsWith(\"java.lang.\"))\n ##带有反回值的方法调用时使用$tool.call来消除返回值\n $tool.call($temp.add($column.type))\n #end\n#end\n##覆盖\n#set($importList = $temp)" - }, { - "name" : "mybatisSupport.vm", - "value" : "##针对Mybatis 进行支持，主要用于生成xml文件\n#foreach($column in $tableInfo.fullColumn)\n ##储存列类型\n $tool.call($column.ext.put(\"sqlType\", $tool.getField($column.obj.dataType, \"typeName\")))\n #if($tool.newHashSet(\"java.lang.String\").contains($column.type))\n #set($jdbcType=\"VARCHAR\")\n #elseif($tool.newHashSet(\"java.lang.Boolean\", \"boolean\").contains($column.type))\n #set($jdbcType=\"BOOLEAN\")\n #elseif($tool.newHashSet(\"java.lang.Byte\", \"byte\").contains($column.type))\n #set($jdbcType=\"BYTE\")\n #elseif($tool.newHashSet(\"java.lang.Integer\", \"int\", \"java.lang.Short\", \"short\").contains($column.type))\n #set($jdbcType=\"INTEGER\")\n #elseif($tool.newHashSet(\"java.lang.Long\", \"long\").contains($column.type))\n #set($jdbcType=\"INTEGER\")\n #elseif($tool.newHashSet(\"java.lang.Float\", \"float\", \"java.lang.Double\", \"double\").contains($column.type))\n #set($jdbcType=\"NUMERIC\")\n #elseif($tool.newHashSet(\"java.util.Date\", \"java.sql.Timestamp\", \"java.time.Instant\", \"java.time.LocalDateTime\", \"java.time.OffsetDateTime\", \"\tjava.time.ZonedDateTime\").contains($column.type))\n #set($jdbcType=\"TIMESTAMP\")\n #elseif($tool.newHashSet(\"java.sql.Date\", \"java.time.LocalDate\").contains($column.type))\n #set($jdbcType=\"TIMESTAMP\")\n #else\n ##其他类型\n #set($jdbcType=\"VARCHAR\")\n #end\n $tool.call($column.ext.put(\"jdbcType\", $jdbcType))\n#end\n\n##定义宏，查询所有列\n#macro(allSqlColumn)#foreach($column in $tableInfo.fullColumn)$column.obj.name#if($velocityHasNext), #end#end#end\n" - } ] - } - } -} \ No newline at end of file diff --git a/docs/images/ai-remi.png b/docs/images/ai-remi.png new file mode 100644 index 0000000..3aa08c3 Binary files /dev/null and b/docs/images/ai-remi.png differ diff --git a/docs/pdmaner/remi-cloud.pdma.json b/docs/pdmaner/remi-cloud.pdma.json deleted file mode 100644 index ad3b244..0000000 --- a/docs/pdmaner/remi-cloud.pdma.json +++ /dev/null @@ -1,19082 +0,0 @@ -{ - "name": "remi-cloud", - "describe": "Remi Cloud", - "avatar": "", - "version": "4.9.4", - "createdTime": "2022-10-11 11:11:00", - "updatedTime": "2024-8-31 21:19:33", - "dbConns": [], - "profile": { - "default": { - "db": "29D1CE08-4C35-4D2D-AAA9-23D93305B52E", - "dbConn": "5BD2695A-1430-49D9-9ECD-D180AA73F477", - "entityInitFields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "A1181084-891B-43A1-A52F-5C94A8FB4544", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "B749CBBF-E1D8-4233-83E6-79FB42FDA697", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E" - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "071B874E-147F-4CFC-8A7F-BF384CA355E4", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E" - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": "", - "uiHint": "", - "id": "92BF430E-01FA-4AEF-944F-25A142632654", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "3BD6FCEF-0662-4781-A982-00C59581199B", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": 32, - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": "", - "uiHint": "", - "id": "ADB3AD14-6603-43E2-8261-114E32442B5B", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": "", - "uiHint": "", - "id": "C8BE2C7A-8251-4ADD-BB4F-411C5754DA62", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": "", - "uiHint": "", - "id": "4E471FD6-3E73-4A90-B660-51598A482409", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": "", - "uiHint": "", - "id": "0DC24AA9-4CD0-45D8-95CF-FA546BE343AB", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": "", - "uiHint": "", - "id": "09F64AC4-4DEE-428F-AF64-4C103884E1AC", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - } - ], - "entityInitProperties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - } - }, - "javaHome": "", - "sql": { - "delimiter": "" - }, - "dataTypeSupports": [ - { - "defKey": "MYSQL", - "id": "29D1CE08-4C35-4D2D-AAA9-23D93305B52E" - }, - { - "defKey": "ORACLE", - "id": "A4E23CB7-BB01-4BD1-9F71-F73F3E15A542" - }, - { - "defKey": "SQLServer", - "id": "BFC87171-C74F-494A-B7C2-76B9C55FACC9" - }, - { - "defKey": "PostgreSQL", - "id": "DFBEC1DD-AA84-456E-BBF3-C95DD0DB2022" - }, - { - "defKey": "DB2", - "id": "89504F5D-94BF-4C9E-8B2E-44F37305FED5" - }, - { - "defKey": "DM", - "id": "0BBCABA5-B8E4-41B0-B8E4-8F5EA6029307" - }, - { - "defKey": "GaussDB", - "id": "592C7013-143D-4E7B-AF64-0D7BF1E28230" - }, - { - "defKey": "Kingbase", - "id": "77BD85E5-9D0D-4096-8427-CBA306FC9C6A" - }, - { - "defKey": "MaxCompute", - "id": "11D1FB71-A587-4217-89BA-611B8A1F83E0" - }, - { - "defKey": "SQLite", - "id": "B363BE0B-F852-49B8-9B2E-F6D2174DEAC1" - }, - { - "defKey": "JAVA", - "id": "797A1496-D649-4261-89B4-544132EC3F36" - }, - { - "defKey": "JavaMybatis", - "id": "895CFD1D-4273-4D32-A2C4-CAC70200AB5B" - }, - { - "defKey": "JavaMybatisPlus", - "id": "A2EE7B4A-CE62-4290-B00C-B26C1BF18073" - }, - { - "defKey": "C#", - "id": "F3AC2415-E86B-40C6-9FEB-F4B7937D2C30" - }, - { - "defKey": "Hive", - "id": "81CCA482-3F4D-4EAC-8CF9-F5E7BC098AD2" - }, - { - "defKey": "Golang", - "id": "B91D99E0-9B7C-416C-8737-B760957DAF09" - } - ], - "codeTemplates": [ - { - "type": "appCode", - "applyFor": "797A1496-D649-4261-89B4-544132EC3F36", - " JpaBean": "{{ var today=new Date();\n var fullYear=today.getFullYear();\n var month=today.getMonth() + 1;\n var days=today.getDate();\n \n var pkVarName = \"undefinedId\";\n var pkDataType = \"String\";\n it.entity.fields.forEach(function(field){\n if(field.primaryKey){\n pkVarName = it.func.camel(field.defKey,false);\n pkDataType = field[\"type\"];\n return;\n }\n });\n \n var pkgName = it.entity.env.base.nameSpace;\n var beanClass = it.entity.env.base.codeRoot;\n var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n var serviceClass = beanClass+'Service';\n var serviceVarName= beanVarName+'Service';\n \n}}package {{=pkgName}}.entity;\n$blankline\nimport io.swagger.annotations.ApiModel;\nimport io.swagger.annotations.ApiModelProperty;\nimport javax.persistence.*;\nimport java.io.Serializable;\nimport java.util.Date;\n$blankline\n\n /**\n * {{=it.entity.defName}};{{=it.entity.comment}}\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@ApiModel(value = \"{{=it.entity.defName}}\",description = \"{{=it.entity.comment}}\")\n@Table(name=\"{{=it.entity.defKey}}\")\npublic class {{=beanClass}} implements Serializable,Cloneable{\n{{~it.entity.fields:field:index}}\n /** {{=it.func.join(field.defName,field.comment,';')}} */\n {{? field.primaryKey }}\n @Id\n @GeneratedValue\n {{?}}\n @Schema(description = name = \"{{=field.defName}}\",notes = \"{{=field.comment}}\")\n private {{=field.type}} {{=it.func.camel(field.defKey,false)}} ;\n{{~}}\n$blankline\n\n{{~it.entity.fields:field:index}}\n /** {{=it.func.join(field.defName,field.comment,';')}} */\n public {{=field.type}} get{{=it.func.camel(field.defKey,true)}}(){\n return this.{{=it.func.camel(field.defKey,false)}};\n }\n /** {{=it.func.join(field.defName,field.comment,';')}} */\n public void set{{=it.func.camel(field.defKey,true)}}({{=field.type}} {{= it.func.camel(field.defKey,false) }}){\n this.{{=it.func.camel(field.defKey,false)}}={{=it.func.camel(field.defKey,false)}};\n }\n{{~}}\n}" - }, - { - "type": "appCode", - "applyFor": "F3AC2415-E86B-40C6-9FEB-F4B7937D2C30", - "Default": "using System;\nusing System.Collections.Generic;\n\n$blankline\n{{\n var today=new Date();\n var fullYear=today.getFullYear();\n var month=today.getMonth() + 1;\n var days=today.getDate();\n}}\n/*\n * @author : http://www.chiner.com.cn\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n * @desc : {{=it.func.join(it.entity.defName,it.entity.comment,'-')}}\n */\nnamespace PDManer.Application\n{\n public partial class {{=it.func.camel(it.entity.defKey,true) }}\n {\n \n {{~it.entity.fields:field:index}}\n /// \n /// {{=it.func.join(field.defName,field.comment,';')}}\n /// \n public {{=field.type}} {{=it.func.camel(field.defKey,true)}} { get; set; }\n $blankline\n {{~}}\n \n }\n}", - "SqlSugar": "using System;\nusing System.Collections.Generic;\nusing SqlSugar;\n\n$blankline\n{{\n var today=new Date();\n var fullYear=today.getFullYear();\n var month=today.getMonth() + 1;\n var days=today.getDate();\n var sqlSugartable='[SugarTable(\"{{=it.entity.defKey}}\", TableDescription = \"{{=it.func.join(it.entity.defName,it.entity.comment,';')}}\")]';\n}}\n/*\n * @author : xkdong@163.com\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n * @desc : {{=it.func.join(it.entity.defName,it.entity.comment,'-')}}\n */\nnamespace Model.DBModel\n{\n /// \n /// {{=it.func.join(it.entity.defName,it.entity.comment,';')}}\n /// \n {{=sqlSugartable}}\n public class {{=it.entity.defKey}}\n {\n {{~it.entity.fields:field:index}}\n /// \n /// {{=it.func.join(field.defName,field.comment,';')}}\n /// \n {{? field.primaryKey }}\n [SugarColumn(IsIdentity = true, IsPrimaryKey = true)]\n {{?}}\n public {{=field.type}} {{=it.func.camel(field.defKey,true)}}{ get; set; }\n $blankline\n {{~}}\n }\n}" - }, - { - "applyFor": "895CFD1D-4273-4D32-A2C4-CAC70200AB5B", - "type": "appCode", - "Controller": "{{ var today=new Date();\n var fullYear=today.getFullYear();\n var month=today.getMonth() + 1;\n var days=today.getDate();\n \n var pkVarName = \"undefinedId\";\n var pkDataType = \"String\";\n it.entity.fields.forEach(function(field){\n if(field.primaryKey){\n pkVarName = it.func.camel(field.defKey,false);\n pkDataType = field[\"type\"];\n return;\n }\n });\n \n var pkgName = it.entity.env.base.nameSpace;\n var beanClass = it.entity.env.base.codeRoot;\n var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n var serviceClass = beanClass+'Service';\n var serviceVarName= beanVarName+'Service';\n \n}}package {{=pkgName}}.controller;\n$blankline\nimport io.swagger.annotations.Api;\nimport io.swagger.annotations.ApiOperation;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.data.domain.Page;\nimport org.springframework.data.domain.PageRequest;\nimport org.springframework.http.ResponseEntity;\nimport org.springframework.web.bind.annotation.*;\nimport {{=pkgName}}.entity.{{=beanClass}};\nimport {{=pkgName}}.service.{{=serviceClass}};\n$blankline\n\n /**\n * {{=it.entity.defName}};({{=it.entity.defKey}})表控制层\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Api(tags = \"{{=it.entity.defName}}对象功能接口\")\n@RestController\n@RequestMapping(\"/{{=it.func.camel(it.entity.defKey,false)}}\")\npublic class {{=beanClass}}Controller{\n @Autowired\n private {{=serviceClass}} {{=serviceVarName}};\n $blankline\n /** \n * 通过ID查询单条数据 \n *\n * @param {{=pkVarName}} 主键\n * @return 实例对象\n */\n @Operation(summary = \"通过ID查询单条数据\")\n @GetMapping(\"{{{=it.func.camel(pkVarName,false)}}}\")\n public ResponseEntity<{{=beanClass}}> queryById({{=pkDataType}} {{=pkVarName}}){\n return ResponseEntity.ok({{=serviceVarName}}.queryById({{=pkVarName}}));\n }\n $blankline\n /** \n * 分页查询\n *\n * @param {{=beanVarName}} 筛选条件\n * @param pageRequest 分页对象\n * @return 查询结果\n */\n @Operation(summary = \"分页查询\")\n @GetMapping\n public ResponseEntity> paginQuery({{=beanClass}} {{=beanVarName}}, PageRequest pageRequest){\n return ResponseEntity.ok({{=serviceVarName}}.paginQuery({{=beanVarName}}, pageRequest));\n }\n $blankline\n /** \n * 新增数据\n *\n * @param {{=beanVarName}} 实例对象\n * @return 实例对象\n */\n @Operation(summary = \"新增数据\")\n @PostMapping\n public ResponseEntity<{{=beanClass}}> add({{=beanClass}} {{=beanVarName}}){\n return ResponseEntity.ok({{=serviceVarName}}.insert({{=beanVarName}}));\n }\n $blankline\n /** \n * 更新数据\n *\n * @param {{=beanVarName}} 实例对象\n * @return 实例对象\n */\n @Operation(summary = \"更新数据\")\n @PutMapping\n public ResponseEntity<{{=beanClass}}> edit({{=beanClass}} {{=beanVarName}}){\n return ResponseEntity.ok({{=serviceVarName}}.update({{=beanVarName}}));\n }\n $blankline\n /** \n * 通过主键删除数据\n *\n * @param {{=pkVarName}} 主键\n * @return 是否成功\n */\n @Operation(summary = \"通过主键删除数据\")\n @DeleteMapping\n public ResponseEntity deleteById({{=pkDataType}} {{=pkVarName}}){\n return ResponseEntity.ok({{=serviceVarName}}.deleteById({{=pkVarName}}));\n }\n}", - "Service": "{{ var today=new Date();\n var fullYear=today.getFullYear();\n var month=today.getMonth() + 1;\n var days=today.getDate();\n \n var pkVarName = \"undefinedId\";\n var pkDataType = \"String\";\n it.entity.fields.forEach(function(field){\n if(field.primaryKey){\n pkVarName = it.func.camel(field.defKey,false);\n pkDataType = field[\"type\"];\n return;\n }\n });\n \n var pkgName = it.entity.env.base.nameSpace;\n var beanClass = it.entity.env.base.codeRoot;\n var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n var serviceClass = beanClass+'Service';\n var serviceVarName= beanVarName+'Service';\n \n}}package {{=pkgName}}.service;\n$blankline\nimport org.springframework.data.domain.Page;\nimport org.springframework.data.domain.PageRequest;\nimport {{=pkgName}}.entity.{{=beanClass}};\n$blankline\n\n /**\n * {{=it.entity.defName}};({{=it.entity.defKey}})表服务接口\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\npublic interface {{=serviceClass}}{\n /** \n * 通过ID查询单条数据 \n *\n * @param {{=pkVarName}} 主键\n * @return 实例对象\n */\n {{=beanClass}} queryById({{=pkDataType}} {{=pkVarName}});\n \n /** \n * 分页查询\n *\n * @param {{=beanVarName}} 筛选条件\n * @param pageRequest 分页对象\n * @return 查询结果\n */\n Page<{{=beanClass}}> paginQuery({{=beanClass}} {{=beanVarName}}, PageRequest pageRequest);\n\n /** \n * 新增数据\n *\n * @param {{=beanVarName}} 实例对象\n * @return 实例对象\n */\n {{=beanClass}} insert({{=beanClass}} {{=beanVarName}});\n\n \n /** \n * 更新数据\n *\n * @param {{=beanVarName}} 实例对象\n * @return 实例对象\n */\n {{=beanClass}} update({{=beanClass}} {{=beanVarName}});\n\n /** \n * 通过主键删除数据\n *\n * @param {{=pkVarName}} 主键\n * @return 是否成功\n */\n boolean deleteById({{=pkDataType}} {{=pkVarName}});\n}", - "ServiceImpl": "{{ var today=new Date();\n var fullYear=today.getFullYear();\n var month=today.getMonth() + 1;\n var days=today.getDate();\n \n var pkVarName = \"undefinedId\";\n var pkVarNameU = \"UndefinedId\";\n var pkDataType = \"String\";\n it.entity.fields.forEach(function(field){\n if(field.primaryKey){\n pkVarName = it.func.camel(field.defKey,false);\n pkVarNameU = it.func.camel(field.defKey,true);\n pkDataType = field[\"type\"];\n return;\n }\n });\n \n var pkgName = it.entity.env.base.nameSpace;\n var beanClass = it.entity.env.base.codeRoot;\n var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n var serviceClass = beanClass+'Service';\n var serviceVarName= beanVarName+'Service';\n var mapperName = beanVarName+'Mapper';\n \n}}package {{=pkgName}}.service.impl;\n$blankline\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.stereotype.Service;\nimport org.springframework.data.domain.Page;\nimport org.springframework.data.domain.PageImpl;\nimport org.springframework.data.domain.PageRequest;\nimport {{=pkgName}}.entity.{{=beanClass}};\nimport {{=pkgName}}.mapper.{{=beanClass}}Mapper;\nimport {{=pkgName}}.service.{{=serviceClass}};\n\n /**\n * {{=it.entity.defName}};({{=it.entity.defKey}})表服务实现类\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Service\npublic class {{=serviceClass}}Impl implements {{=serviceClass}}{\n @Autowired\n private {{=beanClass}}Mapper {{=mapperName}};\n $blankline\n /** \n * 通过ID查询单条数据 \n *\n * @param {{=pkVarName}} 主键\n * @return 实例对象\n */\n public {{=beanClass}} queryById({{=pkDataType}} {{=pkVarName}}){\n return {{=mapperName}}.queryById({{=pkVarName}});\n }\n $blankline\n /** \n * 分页查询\n *\n * @param {{=beanVarName}} 筛选条件\n * @param pageRequest 分页对象\n * @return 查询结果\n */\n public Page<{{=beanClass}}> paginQuery({{=beanClass}} {{=beanVarName}}, PageRequest pageRequest){\n long total = {{=mapperName}}.count({{=beanVarName}});\n return new PageImpl<>({{=mapperName}}.queryAllByLimit({{=beanVarName}}, pageRequest), pageRequest, total);\n }\n $blankline\n /** \n * 新增数据\n *\n * @param {{=beanVarName}} 实例对象\n * @return 实例对象\n */\n public {{=beanClass}} insert({{=beanClass}} {{=beanVarName}}){\n {{=mapperName}}.insert({{=beanVarName}});\n return {{=beanVarName}};\n }\n $blankline\n /** \n * 更新数据\n *\n * @param {{=beanVarName}} 实例对象\n * @return 实例对象\n */\n public {{=beanClass}} update({{=beanClass}} {{=beanVarName}}){\n {{=mapperName}}.update({{=beanVarName}});\n return queryById({{=beanVarName}}.get{{=pkVarNameU}}());\n }\n $blankline\n /** \n * 通过主键删除数据\n *\n * @param {{=pkVarName}} 主键\n * @return 是否成功\n */\n public boolean deleteById({{=pkDataType}} {{=pkVarName}}){\n int total = {{=mapperName}}.deleteById({{=pkVarName}});\n return total > 0;\n }\n}", - "Mapper": "{{ var today=new Date();\n var fullYear=today.getFullYear();\n var month=today.getMonth() + 1;\n var days=today.getDate();\n \n var pkVarName = \"undefinedId\";\n var pkDataType = \"String\";\n it.entity.fields.forEach(function(field){\n if(field.primaryKey){\n pkVarName = it.func.camel(field.defKey,false);\n pkDataType = field[\"type\"];\n return;\n }\n });\n \n var pkgName = it.entity.env.base.nameSpace;\n var beanClass = it.entity.env.base.codeRoot;\n var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n var serviceClass = beanClass+'Service';\n var serviceVarName= beanVarName+'Service';\n \n}}package {{=pkgName}}.mapper;\n$blankline\nimport java.util.List;\nimport org.apache.ibatis.annotations.Mapper;\nimport org.apache.ibatis.annotations.Param;\nimport org.springframework.data.domain.Pageable;\nimport {{=pkgName}}.entity.{{=beanClass}};\n$blankline\n\n /**\n * {{=it.entity.defName}};({{=it.entity.defKey}})表数据库访问层\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Mapper\npublic interface {{=beanClass}}Mapper{\n /** \n * 通过ID查询单条数据 \n *\n * @param {{=pkVarName}} 主键\n * @return 实例对象\n */\n {{=beanClass}} queryById({{=pkDataType}} {{=pkVarName}});\n \n /** \n * 分页查询指定行数据\n *\n * @param {{=beanVarName}} 查询条件\n * @param pageable 分页对象\n * @return 对象列表\n */\n List<{{=beanClass}}> queryAllByLimit({{=beanClass}} {{=beanVarName}}, @Param(\"pageable\") Pageable pageable);\n\n /** \n * 统计总行数\n *\n * @param {{=beanVarName}} 查询条件\n * @return 总行数\n */\n long count({{=beanClass}} {{=beanVarName}});\n\n /** \n * 新增数据\n *\n * @param {{=beanVarName}} 实例对象\n * @return 影响行数\n */\n int insert({{=beanClass}} {{=beanVarName}});\n\n /** \n * 批量新增数据\n *\n * @param entities List<{{=beanClass}}> 实例对象列表\n * @return 影响行数\n */\n int insertBatch(@Param(\"entities\") List<{{=beanClass}}> entities);\n \n /** \n * 批量新增或按主键更新数据\n *\n * @param entities List<{{=beanClass}}> 实例对象列表\n * @return 影响行数\n */\n int insertOrUpdateBatch(@Param(\"entities\") List<{{=beanClass}}> entities);\n \n /** \n * 更新数据\n *\n * @param {{=beanVarName}} 实例对象\n * @return 影响行数\n */\n int update({{=beanClass}} {{=beanVarName}});\n\n /** \n * 通过主键删除数据\n *\n * @param {{=pkVarName}} 主键\n * @return 影响行数\n */\n int deleteById({{=pkDataType}} {{=pkVarName}});\n}", - "Mapper.xml": "{{ var today=new Date();\n var fullYear=today.getFullYear();\n var month=today.getMonth() + 1;\n var days=today.getDate();\n \n var pkVarName = \"undefinedId\";\n var pkDataType = \"String\";\n var pkField = \"UNDEFINED_ID\";\n it.entity.fields.forEach(function(field){\n if(field.primaryKey){\n pkField = field.defKey;\n pkVarName = it.func.camel(field.defKey,false);\n pkDataType = field[\"type\"];\n return;\n }\n });\n \n var pkgName = it.entity.env.base.nameSpace;\n var beanClass = it.entity.env.base.codeRoot;\n var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n var serviceClass = beanClass+'Service';\n var serviceVarName= beanVarName+'Service';\n \n}}\n\n\n \n {{~it.entity.fields:field:index}}\n \n {{~}}\n \n $blankline\n \n \n $blankline\n \n \n $blankline\n \n \n $blankline\n \n \n insert into {{=it.entity.defKey}}({{=it.entity.fields.map(function(e,i){return e.defKey}).join(',')}})\n values ({{=it.entity.fields.map(function(e,i){return '#{'+it.func.camel(e.defKey,false)+'}'}).join(',')}})\n \n $blankline\n \n \n insert into {{=it.entity.defKey}}({{=it.entity.fields.map(function(e,i){return e.defKey}).join(',')}})\n values\n \n ({{=it.entity.fields.map(function(e,i){return '#{entity.'+it.func.camel(e.defKey,false)+'}'}).join(',')}})\n \n \n $blankline\n \n \n insert into {{=it.entity.defKey}}({{=it.entity.fields.map(function(e,i){return e.defKey}).join(',')}})\n values\n \n ({{=it.entity.fields.map(function(e,i){return '#{entity.'+it.func.camel(e.defKey,false)+'}'}).join(',')}})\n \n on duplicate key update\n {{=it.entity.fields.map(function(e,i){return e.defKey + '=values('+e.defKey+')'}).join(',\\n\\t\\t')}}\n \n $blankline\n \n \n update {{=it.entity.defKey}}\n \n {{~it.entity.fields:field:index}}\n \n {{=field.defKey}} = #{{{=it.func.camel(field.defKey,false)}}},\n \n {{~}}\n \n where {{=pkField}} = #{{{=pkVarName}}}\n \n $blankline\n \n \n delete from {{=it.entity.defKey}} where {{=pkField}} = #{{{=pkVarName}}}\n \n\n\n", - "Entity": "{{ var today=new Date();\n var fullYear=today.getFullYear();\n var month=today.getMonth() + 1;\n var days=today.getDate();\n \n var pkVarName = \"undefinedId\";\n var pkDataType = \"String\";\n it.entity.fields.forEach(function(field){\n if(field.primaryKey){\n pkVarName = it.func.camel(field.defKey,false);\n pkDataType = field[\"type\"];\n return;\n }\n });\n \n var pkgName = it.entity.env.base.nameSpace;\n var beanClass = it.entity.env.base.codeRoot;\n var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n var serviceClass = beanClass+'Service';\n var serviceVarName= beanVarName+'Service';\n \n}}package {{=pkgName}}.entity;\n$blankline\nimport io.swagger.annotations.ApiModel;\nimport io.swagger.annotations.ApiModelProperty;\nimport java.io.Serializable;\nimport java.util.Date;\n$blankline\n\n /**\n * {{=it.entity.defName}};{{=it.entity.comment}}\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@ApiModel(value = \"{{=it.entity.defName}}\",description = \"{{=it.entity.comment}}\")\npublic class {{=beanClass}} implements Serializable,Cloneable{\n{{~it.entity.fields:field:index}}\n /** {{=it.func.join(field.defName,field.comment,';')}} */\n @Schema(description = name = \"{{=field.defName}}\",notes = \"{{=field.comment}}\")\n private {{=field.type}} {{=it.func.camel(field.defKey,false)}} ;\n{{~}}\n$blankline\n\n{{~it.entity.fields:field:index}}\n /** {{=it.func.join(field.defName,field.comment,';')}} */\n public {{=field.type}} get{{=it.func.camel(field.defKey,true)}}(){\n return this.{{=it.func.camel(field.defKey,false)}};\n }\n /** {{=it.func.join(field.defName,field.comment,';')}} */\n public void set{{=it.func.camel(field.defKey,true)}}({{=field.type}} {{= it.func.camel(field.defKey,false) }}){\n this.{{=it.func.camel(field.defKey,false)}}={{=it.func.camel(field.defKey,false)}};\n }\n{{~}}\n}" - }, - { - "applyFor": "A2EE7B4A-CE62-4290-B00C-B26C1BF18073", - "type": "appCode", - "Controller": "{{ var today=new Date();\n var fullYear=today.getFullYear();\n var month=today.getMonth() + 1;\n var days=today.getDate();\n \n var pkVarName = \"undefinedId\";\n var pkDataType = \"String\";\n it.entity.fields.forEach(function(field){\n if(field.primaryKey){\n pkVarName = it.func.camel(field.defKey,false);\n pkDataType = field[\"type\"];\n return;\n }\n });\n \n var pkgName = it.entity.env.base.nameSpace;\n var beanClass = it.entity.env.base.codeRoot;\n var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n var serviceClass = beanClass+'Service';\n var serviceVarName= beanVarName+'Service';\n \n}}package {{=pkgName}}.controller;\n$blankline\nimport java.util.List;\nimport io.swagger.annotations.Api;\nimport io.swagger.annotations.ApiOperation;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.data.domain.PageImpl;\nimport org.springframework.data.domain.PageRequest;\nimport org.springframework.http.ResponseEntity;\nimport org.springframework.web.bind.annotation.*;\nimport {{=pkgName}}.entity.{{=beanClass}};\nimport {{=pkgName}}.service.{{=serviceClass}};\n$blankline\n\n /**\n * {{=it.entity.defName}};({{=it.entity.defKey}})表控制层\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Api(tags = \"{{=it.entity.defName}}对象功能接口\")\n@RestController\n@RequestMapping(\"/{{=it.func.camel(it.entity.defKey,false)}}\")\npublic class {{=beanClass}}Controller{\n @Autowired\n private {{=serviceClass}} {{=serviceVarName}};\n $blankline\n /** \n * 通过ID查询单条数据 \n *\n * @param {{=pkVarName}} 主键\n * @return 实例对象\n */\n @Operation(summary = \"通过ID查询单条数据\")\n @GetMapping(\"{{{=it.func.camel(pkVarName,false)}}}\")\n public ResponseEntity<{{=beanClass}}> queryById({{=pkDataType}} {{=pkVarName}}){\n return ResponseEntity.ok({{=serviceVarName}}.queryById({{=pkVarName}}));\n }\n $blankline\n /** \n * 分页查询\n *\n * @param {{=beanVarName}} 筛选条件\n * @param pageRequest 分页对象\n * @return 查询结果\n */\n @Operation(summary = \"分页查询\")\n @GetMapping\n public ResponseEntity> paginQuery({{=beanClass}} {{=beanVarName}}, PageRequest pageRequest){\n //1.分页参数\n long current = pageRequest.getPageNumber();\n long size = pageRequest.getPageSize();\n\n //2.分页查询\n /*把Mybatis的分页对象做封装转换，MP的分页对象上有一些SQL敏感信息，还是通过spring的分页模型来封装数据吧*/\n com.baomidou.mybatisplus.extension.plugins.pagination.Page<{{=beanClass}}> pageResult = {{=serviceVarName}}.paginQuery({{=beanVarName}}, current,size);\n\n //3. 分页结果组装\n List<{{=beanClass}}> dataList = pageResult.getRecords();\n long total = pageResult.getTotal();\n PageImpl<{{=beanClass}}> retPage = new PageImpl<{{=beanClass}}>(dataList,pageRequest,total);\n return ResponseEntity.ok(retPage);\n }\n $blankline\n /** \n * 新增数据\n *\n * @param {{=beanVarName}} 实例对象\n * @return 实例对象\n */\n @Operation(summary = \"新增数据\")\n @PostMapping\n public ResponseEntity<{{=beanClass}}> add({{=beanClass}} {{=beanVarName}}){\n return ResponseEntity.ok({{=serviceVarName}}.insert({{=beanVarName}}));\n }\n $blankline\n /** \n * 更新数据\n *\n * @param {{=beanVarName}} 实例对象\n * @return 实例对象\n */\n @Operation(summary = \"更新数据\")\n @PutMapping\n public ResponseEntity<{{=beanClass}}> edit({{=beanClass}} {{=beanVarName}}){\n return ResponseEntity.ok({{=serviceVarName}}.update({{=beanVarName}}));\n }\n $blankline\n /** \n * 通过主键删除数据\n *\n * @param {{=pkVarName}} 主键\n * @return 是否成功\n */\n @Operation(summary = \"通过主键删除数据\")\n @DeleteMapping\n public ResponseEntity deleteById({{=pkDataType}} {{=pkVarName}}){\n return ResponseEntity.ok({{=serviceVarName}}.deleteById({{=pkVarName}}));\n }\n}", - "Service": "{{ var today=new Date();\n var fullYear=today.getFullYear();\n var month=today.getMonth() + 1;\n var days=today.getDate();\n \n var pkVarName = \"undefinedId\";\n var pkDataType = \"String\";\n it.entity.fields.forEach(function(field){\n if(field.primaryKey){\n pkVarName = it.func.camel(field.defKey,false);\n pkDataType = field[\"type\"];\n return;\n }\n });\n \n var pkgName = it.entity.env.base.nameSpace;\n var beanClass = it.entity.env.base.codeRoot;\n var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n var serviceClass = beanClass+'Service';\n var serviceVarName= beanVarName+'Service';\n \n}}package {{=pkgName}}.service;\n$blankline\nimport com.baomidou.mybatisplus.extension.plugins.pagination.Page;\nimport {{=pkgName}}.entity.{{=beanClass}};\n$blankline\n\n /**\n * {{=it.entity.defName}};({{=it.entity.defKey}})表服务接口\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\npublic interface {{=serviceClass}}{\n $blankline\n /** \n * 通过ID查询单条数据 \n *\n * @param {{=pkVarName}} 主键\n * @return 实例对象\n */\n {{=beanClass}} queryById({{=pkDataType}} {{=pkVarName}});\n $blankline\n /**\n * 分页查询\n *\n * @param {{=beanVarName}} 筛选条件\n * @param current 当前页码\n * @param size 每页大小\n * @return\n */\n Page<{{=beanClass}}> paginQuery({{=beanClass}} {{=beanVarName}}, long current, long size);\n\n /** \n * 新增数据\n *\n * @param {{=beanVarName}} 实例对象\n * @return 实例对象\n */\n {{=beanClass}} insert({{=beanClass}} {{=beanVarName}});\n\n \n /** \n * 更新数据\n *\n * @param {{=beanVarName}} 实例对象\n * @return 实例对象\n */\n {{=beanClass}} update({{=beanClass}} {{=beanVarName}});\n\n /** \n * 通过主键删除数据\n *\n * @param {{=pkVarName}} 主键\n * @return 是否成功\n */\n boolean deleteById({{=pkDataType}} {{=pkVarName}});\n}", - "ServiceImpl": "{{ var today=new Date();\n var fullYear=today.getFullYear();\n var month=today.getMonth() + 1;\n var days=today.getDate();\n \n var pkVarName = \"undefinedId\";\n var pkVarNameU = \"UndefinedId\";\n var pkFieldKey = \"UNDEFINED\";\n var pkDataType = \"String\";\n it.entity.fields.forEach(function(field){\n if(field.primaryKey){\n pkFieldKey = field.defKey;\n pkVarName = it.func.camel(field.defKey,false);\n pkVarNameU = it.func.camel(field.defKey,true);\n pkDataType = field[\"type\"];\n return;\n }\n });\n \n var pkgName = it.entity.env.base.nameSpace;\n var beanClass = it.entity.env.base.codeRoot;\n var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n var serviceClass = beanClass+'Service';\n var serviceVarName= beanVarName+'Service';\n var mapperName = beanVarName+'Mapper';\n \n}}package {{=pkgName}}.service.impl;\n$blankline\nimport cn.hutool.core.util.StrUtil;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.stereotype.Service;\nimport com.baomidou.mybatisplus.core.metadata.IPage;\nimport com.baomidou.mybatisplus.extension.plugins.pagination.Page;\nimport com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;\nimport com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;\n\nimport {{=pkgName}}.entity.{{=beanClass}};\nimport {{=pkgName}}.mapper.{{=beanClass}}Mapper;\nimport {{=pkgName}}.service.{{=serviceClass}};\n\n /**\n * {{=it.entity.defName}};({{=it.entity.defKey}})表服务实现类\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Service\npublic class {{=serviceClass}}Impl implements {{=serviceClass}}{\n @Autowired\n private {{=beanClass}}Mapper {{=mapperName}};\n $blankline\n /** \n * 通过ID查询单条数据 \n *\n * @param {{=pkVarName}} 主键\n * @return 实例对象\n */\n public {{=beanClass}} queryById({{=pkDataType}} {{=pkVarName}}){\n return {{=mapperName}}.selectById({{=pkVarName}});\n }\n $blankline\n /**\n * 分页查询\n *\n * @param {{=beanVarName}} 筛选条件\n * @param current 当前页码\n * @param size 每页大小\n * @return\n */\n public Page<{{=beanClass}}> paginQuery({{=beanClass}} {{=beanVarName}}, long current, long size){\n //1. 构建动态查询条件\n LambdaQueryWrapper<{{=beanClass}}> queryWrapper = new LambdaQueryWrapper<>();\n {{~it.entity.fields.filter(function(e){return e[\"type\"]===\"String\"&&e.defKey !== pkFieldKey}):field:index}}\n if(StrUtil.isNotBlank({{=beanVarName}}.get{{=it.func.camel(field.defKey,true)}}())){\n queryWrapper.eq({{=beanClass}}::get{{=it.func.camel(field.defKey,true)}}, {{=beanVarName}}.get{{=it.func.camel(field.defKey,true)}}());\n }\n {{~}}\n\n //2. 执行分页查询\n Page<{{=beanClass}}> pagin = new Page<>(current , size , true);\n IPage<{{=beanClass}}> selectResult = {{=mapperName}}.selectByPage(pagin , queryWrapper);\n pagin.setPages(selectResult.getPages());\n pagin.setTotal(selectResult.getTotal());\n pagin.setRecords(selectResult.getRecords());\n\n //3. 返回结果\n return pagin;\n }\n $blankline\n /** \n * 新增数据\n *\n * @param {{=beanVarName}} 实例对象\n * @return 实例对象\n */\n public {{=beanClass}} insert({{=beanClass}} {{=beanVarName}}){\n {{=mapperName}}.insert({{=beanVarName}});\n return {{=beanVarName}};\n }\n $blankline\n /** \n * 更新数据\n *\n * @param {{=beanVarName}} 实例对象\n * @return 实例对象\n */\n public {{=beanClass}} update({{=beanClass}} {{=beanVarName}}){\n //1. 根据条件动态更新\n LambdaUpdateChainWrapper<{{=beanClass}}> chainWrapper = new LambdaUpdateChainWrapper<{{=beanClass}}>({{=mapperName}});\n {{~it.entity.fields.filter(function(e){return e[\"type\"]===\"String\"&&e.defKey !== pkFieldKey}):field:index}}\n if(StrUtil.isNotBlank({{=beanVarName}}.get{{=it.func.camel(field.defKey,true)}}())){\n chainWrapper.eq({{=beanClass}}::get{{=it.func.camel(field.defKey,true)}}, {{=beanVarName}}.get{{=it.func.camel(field.defKey,true)}}());\n }\n {{~}}\n //2. 设置主键，并更新\n chainWrapper.set({{=beanClass}}::get{{=pkVarNameU}}, {{=beanVarName}}.get{{=pkVarNameU}}());\n boolean ret = chainWrapper.update();\n //3. 更新成功了，查询最最对象返回\n if(ret){\n return queryById({{=beanVarName}}.get{{=pkVarNameU}}());\n }else{\n return {{=beanVarName}};\n }\n }\n $blankline\n /** \n * 通过主键删除数据\n *\n * @param {{=pkVarName}} 主键\n * @return 是否成功\n */\n public boolean deleteById({{=pkDataType}} {{=pkVarName}}){\n int total = {{=mapperName}}.deleteById({{=pkVarName}});\n return total > 0;\n }\n}", - "Mapper": "{{ var today=new Date();\n var fullYear=today.getFullYear();\n var month=today.getMonth() + 1;\n var days=today.getDate();\n \n var pkVarName = \"undefinedId\";\n var pkDataType = \"String\";\n it.entity.fields.forEach(function(field){\n if(field.primaryKey){\n pkVarName = it.func.camel(field.defKey,false);\n pkDataType = field[\"type\"];\n return;\n }\n });\n \n var pkgName = it.entity.env.base.nameSpace;\n var beanClass = it.entity.env.base.codeRoot;\n var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n var serviceClass = beanClass+'Service';\n var serviceVarName= beanVarName+'Service';\n \n}}package {{=pkgName}}.mapper;\n$blankline\n\nimport com.baomidou.mybatisplus.core.conditions.Wrapper;\nimport com.baomidou.mybatisplus.core.mapper.BaseMapper;\nimport com.baomidou.mybatisplus.core.metadata.IPage;\nimport com.baomidou.mybatisplus.core.toolkit.Constants;\nimport org.apache.ibatis.annotations.Mapper;\nimport org.apache.ibatis.annotations.Param;\nimport {{=pkgName}}.entity.{{=beanClass}};\n$blankline\n\n /**\n * {{=it.entity.defName}};({{=it.entity.defKey}})表数据库访问层\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@Mapper\npublic interface {{=beanClass}}Mapper extends BaseMapper<{{=beanClass}}>{\n /** \n * 分页查询指定行数据\n *\n * @param page 分页参数\n * @param wrapper 动态查询条件\n * @return 分页对象列表\n */\n IPage<{{=beanClass}}> selectByPage(IPage<{{=beanClass}}> page , @Param(Constants.WRAPPER) Wrapper<{{=beanClass}}> wrapper);\n}", - "Mapper.xml": "{{ var today=new Date();\n var fullYear=today.getFullYear();\n var month=today.getMonth() + 1;\n var days=today.getDate();\n \n var pkVarName = \"undefinedId\";\n var pkDataType = \"String\";\n var pkField = \"UNDEFINED_ID\";\n it.entity.fields.forEach(function(field){\n if(field.primaryKey){\n pkField = field.defKey;\n pkVarName = it.func.camel(field.defKey,false);\n pkDataType = field[\"type\"];\n return;\n }\n });\n \n var pkgName = it.entity.env.base.nameSpace;\n var beanClass = it.entity.env.base.codeRoot;\n var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n var serviceClass = beanClass+'Service';\n var serviceVarName= beanVarName+'Service';\n \n}}\n\n$blankline\n\n\n \n\n\n", - "Entity": "{{ var today=new Date();\n var fullYear=today.getFullYear();\n var month=today.getMonth() + 1;\n var days=today.getDate();\n \n var pkVarName = \"undefinedId\";\n var pkDataType = \"String\";\n it.entity.fields.forEach(function(field){\n if(field.primaryKey){\n pkVarName = it.func.camel(field.defKey,false);\n pkDataType = field[\"type\"];\n return;\n }\n });\n \n var pkgName = it.entity.env.base.nameSpace;\n var beanClass = it.entity.env.base.codeRoot;\n var beanVarName = beanClass.charAt(0).toLowerCase()+beanClass.slice(1);\n var serviceClass = beanClass+'Service';\n var serviceVarName= beanVarName+'Service';\n \n}}package {{=pkgName}}.entity;\n$blankline\nimport io.swagger.annotations.ApiModel;\nimport io.swagger.annotations.ApiModelProperty;\nimport com.baomidou.mybatisplus.annotation.TableName;\nimport com.baomidou.mybatisplus.annotation.TableId;\nimport java.io.Serializable;\nimport java.util.Date;\n$blankline\n\n /**\n * {{=it.entity.defName}};{{=it.entity.comment}}\n * @author : http://www.chiner.pro\n * @date : {{=fullYear}}-{{=month}}-{{=days}}\n */\n@ApiModel(value = \"{{=it.entity.defName}}\",description = \"{{=it.entity.comment}}\")\n@TableName(\"{{=it.entity.defKey}}\")\npublic class {{=beanClass}} implements Serializable,Cloneable{\n{{~it.entity.fields:field:index}}\n /** {{=it.func.join(field.defName,field.comment,';')}} */\n @Schema(description = name = \"{{=field.defName}}\",notes = \"{{=field.comment}}\")\n {{? field.primaryKey }}\n @TableId\n {{?}}\n private {{=field.type}} {{=it.func.camel(field.defKey,false)}} ;\n{{~}}\n$blankline\n\n{{~it.entity.fields:field:index}}\n /** {{=it.func.join(field.defName,field.comment,';')}} */\n public {{=field.type}} get{{=it.func.camel(field.defKey,true)}}(){\n return this.{{=it.func.camel(field.defKey,false)}};\n }\n /** {{=it.func.join(field.defName,field.comment,';')}} */\n public void set{{=it.func.camel(field.defKey,true)}}({{=field.type}} {{= it.func.camel(field.defKey,false) }}){\n this.{{=it.func.camel(field.defKey,false)}}={{=it.func.camel(field.defKey,false)}};\n }\n{{~}}\n}" - }, - { - "applyFor": "29D1CE08-4C35-4D2D-AAA9-23D93305B52E", - "type": "dbDDL", - "createTable": "DROP TABLE IF EXISTS {{=it.entity.defKey}};\nCREATE TABLE {{=it.entity.defKey}}(\n{{ pkList = [] ; }}\n{{~it.entity.fields:field:index}}\n {{? field.primaryKey }}{{ pkList.push(field.defKey) }}{{?}}\n {{=field.defKey}} {{=field.dbType}}{{?field.len>0}}{{='('}}{{=field.len}}{{?field.scale>0}}{{=','}}{{=field.scale}}{{?}}{{=')'}}{{?}} {{= field.notNull ? 'NOT NULL' : '' }} {{= field.autoIncrement ? 'AUTO_INCREMENT' : '' }} {{= field.defaultValue ? it.func.join('DEFAULT',field.defaultValue,' ') : '' }} COMMENT '{{=it.func.join(field.defName,field.comment,';')}}' {{= index < it.entity.fields.length-1 ? ',' : ( pkList.length>0 ? ',' :'' ) }}\n{{~}}\n{{? pkList.length >0 }}\n PRIMARY KEY ({{~pkList:pkName:i}}{{= pkName }}{{= i'+(after.defKey||'NULL'));\n }\n if(before.defName !== after.defName){\n ret.push('显示名称:'+(before.defName||'NULL')+'->'+(after.defName||'NULL'));\n }\n if(before.comment !== after.comment){\n ret.push('说明:'+(before.comment||'NULL')+'->'+(after.comment||'NULL'));\n }\n if(ret.length>0){\n return ' 基本信息:\\n\\t'+ret.join('\\n\\t');\n }\n return '';\n };\n \n function buildAddedDesc(entity){\n let ret = [];\n let fieldAdded = entity.data.fieldAdded||[];\n \n for (let field of fieldAdded) { \n let row = [];\n row.push(field.defKey+'['+field.defName+']');\n ret.push(row.join(\"\"))\n }\n return ret;\n };\n \n function buildRemovedDesc(entity){\n let ret = [];\n let fieldRemoved = entity.data.fieldRemoved||[];\n \n for (let field of fieldRemoved) { \n let row = [];\n row.push(field.defKey+'['+field.defName+']');\n ret.push(row.join(\"\"))\n }\n return ret;\n };\n \n function buildModifiedDesc(entity){\n let ret = [];\n let fieldModified = entity.data.fieldModified||[];\n \n for (let field1 of fieldModified) { \n let row = [];\n let field = field1.before;\n row.push(field.defKey+'['+field.defName+']');\n ret.push(row.join(\"\"))\n }\n return ret;\n };\n}}\n\n\n{{? createEntities && createEntities.length > 0}}\n/* --------------- 创建表 --------------- */\n{{~ createEntities:entity}}\n{{=entity.data.defKey}}[{{=entity.data.defName}}]\n{{~}}\n{{?}}\n\n\n{{? dropEntities && dropEntities.length > 0}}\n/* --------------- 删除表 --------------- */\n{{~ dropEntities:entity}}\n{{=entity.data.defKey}}[{{=entity.data.defName}}]\n{{~}}\n{{?}}\n\n{{? modifyEntities && modifyEntities.length > 0}}\n/* --------------- 修改表 --------------- */\n{{~ modifyEntities:entity}}\n{{=entity.data.baseInfo.defKey}}[{{=entity.data.baseInfo.defName}}]{{let changeText=baseChanged(entity.data.baseChanged);}}\n{{=baseChanged(entity.data.baseChanged)}}\n {{? entity.data.fieldModified && entity.data.fieldModified.length > 0}}\n 修改字段：\n {{='\\t'}}{{=buildModifiedDesc(entity).join('\\n\\t')}}{{?}}{{\n /*计算是否调整了属性*/\n let propAdded = entity.data.propAdded || [];\n let propRemoved = entity.data.propRemoved || [];\n let propModified = entity.data.propModified || [];\n let changed = propAdded.length>0 || propRemoved.length>0 || propModified.length>0;\n /*计算关联是否调整*/\n let refEntityAdd = entity.data.refEntityAdd || [];\n let refEntityRemoved = entity.data.refEntityRemoved || [];\n let relaArray = [];\n for (let rela of refEntityAdd) {\n relaArray.push('建立关联:'+rela.defKey+'['+rela.defName+']');\n }\n for (let rela of refEntityRemoved) {\n relaArray.push('解除关联:'+rela.defKey+'['+rela.defName+']');\n }\n /*索引是否修改过*/\n let indexChanged = entity.data.indexChanged;\n }}{{=indexChanged?'\\n\\t更改了索引':''}}{{=changed?'\\n\\t更改了属性':''}}{{=relaArray.length>0?('\\n\\t'+relaArray.join('\\n\\t')):''}}\n{{? entity.data.fieldAdded && entity.data.fieldAdded.length > 0}}\n 添加字段：\n{{='\\t'}}{{=buildAddedDesc(entity).join('\\n\\t')}}\n{{?}}{{? entity.data.fieldRemoved && entity.data.fieldRemoved.length > 0}}\n 删除字段：\n{{='\\t'}}{{=buildRemovedDesc(entity).join('\\n\\t')}}\n{{?}}\n{{~}}\n{{?}}\n", - "update": "{{\n let createEntities = it.changes.filter(function(row){return (row.opt==='add'&&row['type']==='entity');});\n let dropEntities = it.changes.filter(function(row){return (row.opt==='delete'&&row['type']==='entity');});\n let modifyEntities = it.changes.filter(function(row){return (row.opt==='update'&&row['type']==='entity');});\n \n function baseChangedDDL(beforeAfter){\n if(beforeAfter == null){\n return '';\n }\n let ret = [];\n let before = beforeAfter.before || {\"defKey\":\"\",\"defName\":\"\",\"comment\":\"\"};\n let after = beforeAfter.after || {\"defKey\":\"\",\"defName\":\"\",\"comment\":\"\"};\n if(before.defKey !== after.defKey){\n ret.push('ALTER TABLE '+before.defKey+' RENAME TO '+after.defKey);\n }\n let commentText = '';\n let commentChanged = false;\n if(before.defName !== after.defName){\n commentText = after.defName;\n commentChanged = true;\n }\n if(before.comment !== after.comment){\n commentChanged = true;\n if(commentText){\n commentText = (commentText+ ';'+after.comment)\n }else{\n commentText = after.comment\n }\n }\n if(commentChanged){\n ret.push('ALTER TABLE '+after.defKey+' COMMENT \\''+commentText+'\\'');\n }\n let baseText = '-- 基本信息:\\n';\n return baseText+ret.join(';\\n')+';';\n };\n \n function buildAddedDDL(entity){\n let ret = [];\n let fieldAdded = entity.data.fieldAdded||[];\n if(fieldAdded.length == 0){\n return '';\n }\n \n let firstDDL = 'ALTER TABLE '+entity.data.baseInfo.defKey;\n for (let field of fieldAdded) { \n let ddlItem = 'ADD COLUMN '+field.defKey+' '+field.dbType;\n /*处理数据类型长度*/\n if(field.len>0){\n ddlItem += ('('+field.len);\n if(parseInt(field.scale)>0){\n ddlItem += (','+field.scale);\n }\n ddlItem += ')';\n }\n if(field.notNull){\n ddlItem += ' NOT NULL';\n }\n if(field.autoIncrement){\n ddlItem += ' AUTO_INCREMENT';\n }\n if(field.defaultValue){\n ddlItem += (' DEFAULT' + field.defaultValue);\n }\n ddlItem += (' COMMENT \\''+field.defName+';'+field.comment+'\\'');\n \n if(field.index>0 && field.afterFieldKey){\n ddlItem += (' AFTER '+field.afterFieldKey);\n }\n ret.push(ddlItem);\n }\n return firstDDL+'\\n'+ret.join(',\\n');\n };\n \n function buildRemovedDDL(entity){\n let ret = [];\n let fieldRemoved = entity.data.fieldRemoved||[];\n if(fieldRemoved.length == 0){\n return '';\n }\n \n let firstDDL = 'ALTER TABLE '+entity.data.baseInfo.defKey;\n for (let field of fieldRemoved) { \n ret.push('DROP '+field.defKey);\n }\n return firstDDL+'\\n'+ret.join(',\\n');\n };\n \n function buildModifiedDDL(entity){\n let ret = [];\n let fieldModified = entity.data.fieldModified||[];\n \n let firstDDL = 'ALTER TABLE '+entity.data.baseInfo.defKey;\n for (let field of fieldModified) { \n let changeDDL = '';\n let before = field.before || {};\n let after = field.after || {};\n if(before.defKey === after.defKey){\n changeDDL += (' MODIFY COLUMN '+after.defKey);\n }else{\n changeDDL += (' CHANGE COLUMN '+before.defKey+' '+after.defKey);\n }\n changeDDL += (' '+after.dbType);\n if(after.len>0){\n changeDDL += ('('+after.len);\n if(parseInt(after.scale)>0){\n changeDDL += (','+after.scale);\n }\n changeDDL += ')';\n }\n if(after.notNull){\n changeDDL += ' NOT NULL';\n }\n let defaultValue = '';\n if(after.defaultValue != null && after.defaultValue.length>0){\n defaultValue = (after.defaultValue);\n }else{\n defaultValue = 'NULL';\n }\n changeDDL += (' DEFAULT ' + defaultValue);\n let comment = after.comment||'';\n changeDDL += (' COMMENT \\''+comment+'\\';');\n ret.push(firstDDL+' '+changeDDL);\n }\n return ret;\n };\n}}\n{{? createEntities && createEntities.length > 0}}\n/* --------------- 创建表 --------------- */\n{{~ createEntities:entity}}\n{{=it.func.createDDL(entity.data,entity['type'])}}\n{{~}}\n{{?}}\n\n\n{{? dropEntities && dropEntities.length > 0}}\n/* --------------- 删除表 --------------- */\n{{~ dropEntities:entity}}\n{{=it.func.dropDDL(entity.data,entity['type'])}}\n{{~}}\n{{?}}\n\n\n{{? modifyEntities && modifyEntities.length > 0}}\n{{~ modifyEntities:entity}}\n/* --------------- 修改表 --------------- */\n-- 修改表：{{=entity.data.baseInfo.defKey}}[{{=entity.data.baseInfo.defName}}]\n{{=baseChangedDDL(entity.data.baseChanged)}}\n{{? entity.data.fieldModified && entity.data.fieldModified.length > 0}}\n-- 修改字段：\n{{=buildModifiedDDL(entity).join('\\n')}}\n{{?}}{{\n/*索引是否修改过*/\nlet indexChanged = entity.data.indexChanged;\n}}\n{{? indexChanged }}\n{{=it.func.indexRebuildDDL(entity.data.baseInfo,entity.data.newIndexes,entity.data.fullFields,entity['type'])}}\n{{?}}\n\n{{? entity.data.fieldAdded && entity.data.fieldAdded.length > 0}}\n-- 添加字段：\n{{=buildAddedDDL(entity)}};\n{{?}}\n\n{{? entity.data.fieldRemoved && entity.data.fieldRemoved.length > 0}}\n-- 删除字段：\n{{=buildRemovedDDL(entity)}};\n{{?}}\n{{~}}\n{{?}}" - }, - { - "applyFor": "A4E23CB7-BB01-4BD1-9F71-F73F3E15A542", - "type": "dbDDL", - "createTable": "CREATE TABLE {{=it.entity.defKey}}(\n{{ pkList = [] ; }}\n{{~it.entity.fields:field:index}}\n {{? field.primaryKey }}{{ pkList.push(field.defKey) }}{{?}}\n \"{{=field.defKey}}\" {{=field.type}}{{?field.len>0}}{{='('}}{{=field.len}}{{?field.scale>0}}{{=','}}{{=field.scale}}{{?}}{{=')'}}{{?}}{{= field.defaultValue ? it.func.join(' DEFAULT ',field.defaultValue,' ') : '' }}{{= field.notNull ? ' NOT NULL' : '' }}{{= field.autoIncrement ? '' : '' }}{{= index < it.entity.fields.length-1 ? ',' : ( pkList.length>0 ? ',' :'' ) }}\n{{~}}\n{{? pkList.length >0 }}\n PRIMARY KEY ({{~pkList:pkName:i}}{{= pkName }}{{= i'+(after.defKey||'NULL'));\n }\n if(before.defName !== after.defName){\n ret.push('显示名称:'+(before.defName||'NULL')+'->'+(after.defName||'NULL'));\n }\n if(before.comment !== after.comment){\n ret.push('说明:'+(before.comment||'NULL')+'->'+(after.comment||'NULL'));\n }\n if(ret.length>0){\n return ' 基本信息:\\n\\t'+ret.join('\\n\\t');\n }\n return '';\n };\n \n function buildAddedDesc(entity){\n let ret = [];\n let fieldAdded = entity.data.fieldAdded||[];\n \n for (let field of fieldAdded) { \n let row = [];\n row.push(field.defKey+'['+field.defName+']');\n ret.push(row.join(\"\"))\n }\n return ret;\n };\n \n function buildRemovedDesc(entity){\n let ret = [];\n let fieldRemoved = entity.data.fieldRemoved||[];\n \n for (let field of fieldRemoved) { \n let row = [];\n row.push(field.defKey+'['+field.defName+']');\n ret.push(row.join(\"\"))\n }\n return ret;\n };\n \n function buildModifiedDesc(entity){\n let ret = [];\n let fieldModified = entity.data.fieldModified||[];\n \n for (let field1 of fieldModified) { \n let row = [];\n let field = field1.before;\n row.push(field.defKey+'['+field.defName+']');\n ret.push(row.join(\"\"))\n }\n return ret;\n };\n}}\n{{? createEntities && createEntities.length > 0}}\n/* -------------------------------------------------- */\n创建表：\n{{~ createEntities:entity}}\n {{=entity.data.defKey}}[{{=entity.data.defName}}]\n{{~}}\n{{?}}\n\n\n{{? dropEntities && dropEntities.length > 0}}\n/* -------------------------------------------------- */\n删除表：\n{{~ dropEntities:entity}}\n {{=entity.data.defKey}}[{{=entity.data.defName}}]\n{{~}}\n{{?}}\n\n\n{{? modifyEntities && modifyEntities.length > 0}}\n{{~ modifyEntities:entity}}\n/* -------------------------------------------------- */\n修改表：{{=entity.data.baseInfo.defKey}}[{{=entity.data.baseInfo.defName}}]{{let changeText=baseChanged(entity.data.baseChanged);}}\n{{=baseChanged(entity.data.baseChanged)}}\n {{? entity.data.fieldAdded && entity.data.fieldAdded.length > 0}}\n 添加字段：\n {{='\\t'}}{{=buildAddedDesc(entity).join('\\n\\t')}}\n {{?}}{{? entity.data.fieldRemoved && entity.data.fieldRemoved.length > 0}}\n 删除字段：\n {{='\\t'}}{{=buildRemovedDesc(entity).join('\\n\\t')}}\n {{?}}{{? entity.data.fieldModified && entity.data.fieldModified.length > 0}}\n 修改字段：\n {{='\\t'}}{{=buildModifiedDesc(entity).join('\\n\\t')}}\n {{?}}{{\n /*计算是否调整了属性*/\n let propAdded = entity.data.propAdded || [];\n let propRemoved = entity.data.propRemoved || [];\n let propModified = entity.data.propModified || [];\n let changed = propAdded.length>0 || propRemoved.length>0 || propModified.length>0;\n /*计算关联是否调整*/\n let refEntityAdd = entity.data.refEntityAdd || [];\n let refEntityRemoved = entity.data.refEntityRemoved || [];\n let relaArray = [];\n for (let rela of refEntityAdd) {\n relaArray.push('\\n\\t建立关联:'+rela.defKey+'['+rela.defName+']');\n }\n for (let rela of refEntityRemoved) {\n relaArray.push('\\n\\t解除关联:'+rela.defKey+'['+rela.defName+']');\n }\n /*索引是否修改过*/\n let indexChanged = entity.data.indexChanged;\n }}\n{{=indexChanged?'\\n\\t更改了索引':''}}\n{{=changed?'\\n\\t更改了属性':''}}\n{{=relaArray.length>0?relaArray.join(''):''}}\n{{~}}\n{{?}}", - "update": "{{\n let createEntities = it.changes.filter(function(row){return (row.opt==='add'&&row['type']==='entity');});\n let dropEntities = it.changes.filter(function(row){return (row.opt==='delete'&&row['type']==='entity');});\n let modifyEntities = it.changes.filter(function(row){return (row.opt==='update'&&row['type']==='entity');});\n \n function baseChangedDDL(beforeAfter){\n if(beforeAfter == null){\n return '';\n }\n let ret = [];\n let before = beforeAfter.before || {\"defKey\":\"\",\"defName\":\"\",\"comment\":\"\"};\n let after = beforeAfter.after || {\"defKey\":\"\",\"defName\":\"\",\"comment\":\"\"};\n if(before.defKey !== after.defKey){\n ret.push(`ALTER TABLE ${before.defKey} RENAME TO ${after.defKey}`);\n }\n let commentText = '';\n let commentChanged = false;\n if(before.defName !== after.defName){\n commentText = after.defName;\n commentChanged = true;\n }\n if(before.comment !== after.comment){\n commentChanged = true;\n if(commentText){\n commentText = (commentText+ ';'+after.comment)\n }else{\n commentText = after.comment\n }\n }\n if(commentChanged){\n let myText = `COMMENT ON TABLE ${after.defKey} IS '${commentText}'`;\n ret.push(myText);\n }\n let baseText = '-- 基本信息:\\n';\n return baseText+ret.join(';\\n')+';';\n };\n \n function buildAddedDDL(entity){\n let ret = [];\n let fieldAdded = entity.data.fieldAdded||[];\n if(fieldAdded.length == 0){\n return '';\n }\n \n let firstDDL = `ALTER TABLE ${entity.data.baseInfo.defKey}`;\n for (let field of fieldAdded) { \n let ddlItem = `ADD (${field.defKey} ${field.dbType}`;\n /*处理数据类型长度*/\n if(field.len>0){\n ddlItem += ('('+field.len);\n if(parseInt(field.scale)>0){\n ddlItem += (','+field.scale);\n }\n ddlItem += ')';\n }\n let defaultValue = field.defaultValue;\n defaultValue = (defaultValue==null)?\"\":(\"\"+defaultValue);\n if(defaultValue.length>0){\n ddlItem += (' DEFAULT ' + defaultValue);\n }\n if(field.notNull){\n ddlItem += ' NOT NULL';\n }\n ddlItem += ')';\n ret.push(`${firstDDL} ${ddlItem}`);\n \n /*处理字段注释*/\n let fieldComments = [];\n if(field.defName != null &&field.defName.length>0){\n fieldComments.push(field.defName);\n }\n if(field.comment != null &&field.comment.length>0){\n fieldComments.push(field.comment);\n }\n let commentText = fieldComments.join(';');\n if(commentText != null && commentText.length > 0){\n let commentDDL = `COMMENT ON COLUMN ${entity.data.baseInfo.defKey}.${field.defKey} IS '${commentText}'`;\n ret.push(commentDDL);\n }\n }\n return '\\n'+ret.join(';\\n');\n };\n \n function buildRemovedDDL(entity){\n let ret = [];\n let fieldRemoved = entity.data.fieldRemoved||[];\n if(fieldRemoved.length == 0){\n return '';\n }\n \n let firstDDL = `ALTER TABLE ${entity.data.baseInfo.defKey}`;\n for (let field of fieldRemoved) { \n ret.push(`${firstDDL} DROP COLUMN ${field.defKey}`);\n }\n return '\\n'+ret.join(';\\n');\n };\n \n function buildModifiedDDL(entity){\n let ret = [];\n let fieldModified = entity.data.fieldModified||[];\n \n let firstDDL = `ALTER TABLE ${entity.data.baseInfo.defKey}`;\n for (let field of fieldModified) { \n let changeDDL = '';\n let before = field.before || {};\n let after = field.after || {};\n if(before.defKey !== after.defKey){\n let renameText = `ALTER TABLE ${entity.data.baseInfo.defKey} RENAME COLUMN ${before.defKey} TO ${after.defKey};`;\n ret.push(renameText);\n }\n /*如果没有变化，则不生成变更语句*/\n if(before.dbType === after.dbType \n && before['len'] === after['len'] \n && before.scale === after.scale\n && before.primaryKey === after.primaryKey\n && before.notNull === after.notNull\n && before.autoIncrement === after.autoIncrement\n && before.defaultValue === after.defaultValue){\n continue;\n }\n changeDDL += ('MODIFY ('+after.defKey+'');\n changeDDL += (' '+after.dbType);\n if(after.len>0){\n changeDDL += ('('+after.len);\n if(parseInt(after.scale)>0){\n changeDDL += (','+after.scale);\n }\n changeDDL += ')';\n }\n let defaultValue = after.defaultValue;\n defaultValue = (defaultValue==null)?\"\":(\"\"+defaultValue);\n if(defaultValue.length>0){\n changeDDL += (' DEFAULT ' + defaultValue);\n }\n \n if(after.notNull){\n changeDDL += ' NOT NULL';\n }\n changeDDL += ')';\n ret.push(`${firstDDL} ${changeDDL};`);\n }\n return ret;\n };\n}}\n{{? createEntities && createEntities.length > 0}}\n/* --------------- 创建表 --------------- */\n{{~ createEntities:entity}}\n{{=it.func.createDDL(entity.data,entity['type'])}}\n{{~}}\n{{?}}\n\n\n{{? dropEntities && dropEntities.length > 0}}\n/* --------------- 删除表 --------------- */\n{{~ dropEntities:entity}}\n{{=it.func.dropDDL(entity.data,entity['type'])}}\n{{~}}\n{{?}}\n\n\n{{? modifyEntities && modifyEntities.length > 0}}\n{{~ modifyEntities:entity}}\n/* --------------- 修改表 --------------- */\n-- 修改表：{{=entity.data.baseInfo.defKey}}[{{=entity.data.baseInfo.defName}}]\n{{=baseChangedDDL(entity.data.baseChanged)}}\n{{? entity.data.fieldModified && entity.data.fieldModified.length > 0}}\n-- 修改字段：\n{{=buildModifiedDDL(entity).join('\\n')}}\n{{?}}{{\n/*索引是否修改过*/\nlet indexChanged = entity.data.indexChanged;\n}}\n{{? indexChanged }}\n{{=it.func.indexRebuildDDL(entity.data.baseInfo,entity.data.newIndexes,entity.data.fullFields,entity['type'])}}\n{{?}}\n\n{{? entity.data.fieldAdded && entity.data.fieldAdded.length > 0}}\n-- 添加字段：\n{{=buildAddedDDL(entity)}};\n{{?}}\n\n{{? entity.data.fieldRemoved && entity.data.fieldRemoved.length > 0}}\n-- 删除字段：\n{{=buildRemovedDDL(entity)}};\n{{?}}\n{{~}}\n{{?}}" - }, - { - "applyFor": "BFC87171-C74F-494A-B7C2-76B9C55FACC9", - "type": "dbDDL", - "createTable": "IF EXISTS (SELECT * FROM remi.objects WHERE object_id = OBJECT_ID(N'[dbo].[{{=it.entity.defKey}}]') AND type in (N'U')) DROP TABLE [dbo].[{{=it.entity.defKey}}];\n\nCREATE TABLE [dbo].[{{=it.entity.defKey}}](\n{{ pkList = [] ; }}\n{{~it.entity.fields:field:index}}\n {{? field.primaryKey }}{{ pkList.push(field.defKey) }}{{?}}\n {{=field.defKey}} {{=field.type}}{{?field.len>0}}{{='('}}{{=field.len}}{{?field.scale>0}}{{=','}}{{=field.scale}}{{?}}{{=')'}}{{?}}{{= field.notNull ? ' NOT NULL' : '' }}{{= field.autoIncrement ? ' IDENTITY(1,1)' : '' }}{{= field.defaultValue ? it.func.join(' DEFAULT ',field.defaultValue,' ') : '' }}{{= index < it.entity.fields.length-1 ? ',' : ( pkList.length>0 ? ',' :'' ) }}\n{{~}}\n{{? pkList.length >0 }}\n PRIMARY KEY ({{~pkList:pkName:i}}{{= pkName }}{{= i'+(after.defKey||'NULL'));\n }\n if(before.defName !== after.defName){\n ret.push('显示名称:'+(before.defName||'NULL')+'->'+(after.defName||'NULL'));\n }\n if(before.comment !== after.comment){\n ret.push('说明:'+(before.comment||'NULL')+'->'+(after.comment||'NULL'));\n }\n if(ret.length>0){\n return ' 基本信息:\\n\\t'+ret.join('\\n\\t');\n }\n return '';\n };\n \n function buildAddedDesc(entity){\n let ret = [];\n let fieldAdded = entity.data.fieldAdded||[];\n \n for (let field of fieldAdded) { \n let row = [];\n row.push(field.defKey+'['+field.defName+']');\n ret.push(row.join(\"\"))\n }\n return ret;\n };\n \n function buildRemovedDesc(entity){\n let ret = [];\n let fieldRemoved = entity.data.fieldRemoved||[];\n \n for (let field of fieldRemoved) { \n let row = [];\n row.push(field.defKey+'['+field.defName+']');\n ret.push(row.join(\"\"))\n }\n return ret;\n };\n \n function buildModifiedDesc(entity){\n let ret = [];\n let fieldModified = entity.data.fieldModified||[];\n \n for (let field1 of fieldModified) { \n let row = [];\n let field = field1.before;\n row.push(field.defKey+'['+field.defName+']');\n ret.push(row.join(\"\"))\n }\n return ret;\n };\n}}\n\n\n{{? createEntities && createEntities.length > 0}}\n/* --------------- 创建表 --------------- */\n{{~ createEntities:entity}}\n{{=entity.data.defKey}}[{{=entity.data.defName}}]\n{{~}}\n{{?}}\n\n\n{{? dropEntities && dropEntities.length > 0}}\n/* --------------- 删除表 --------------- */\n{{~ dropEntities:entity}}\n{{=entity.data.defKey}}[{{=entity.data.defName}}]\n{{~}}\n{{?}}\n\n{{? modifyEntities && modifyEntities.length > 0}}\n/* --------------- 修改表 --------------- */\n{{~ modifyEntities:entity}}\n{{=entity.data.baseInfo.defKey}}[{{=entity.data.baseInfo.defName}}]{{let changeText=baseChanged(entity.data.baseChanged);}}\n{{=baseChanged(entity.data.baseChanged)}}\n {{? entity.data.fieldModified && entity.data.fieldModified.length > 0}}\n 修改字段：\n {{='\\t'}}{{=buildModifiedDesc(entity).join('\\n\\t')}}{{?}}{{\n /*计算是否调整了属性*/\n let propAdded = entity.data.propAdded || [];\n let propRemoved = entity.data.propRemoved || [];\n let propModified = entity.data.propModified || [];\n let changed = propAdded.length>0 || propRemoved.length>0 || propModified.length>0;\n /*计算关联是否调整*/\n let refEntityAdd = entity.data.refEntityAdd || [];\n let refEntityRemoved = entity.data.refEntityRemoved || [];\n let relaArray = [];\n for (let rela of refEntityAdd) {\n relaArray.push('建立关联:'+rela.defKey+'['+rela.defName+']');\n }\n for (let rela of refEntityRemoved) {\n relaArray.push('解除关联:'+rela.defKey+'['+rela.defName+']');\n }\n /*索引是否修改过*/\n let indexChanged = entity.data.indexChanged;\n }}{{=indexChanged?'\\n\\t更改了索引':''}}{{=changed?'\\n\\t更改了属性':''}}{{=relaArray.length>0?('\\n\\t'+relaArray.join('\\n\\t')):''}}\n{{? entity.data.fieldAdded && entity.data.fieldAdded.length > 0}}\n 添加字段：\n{{='\\t'}}{{=buildAddedDesc(entity).join('\\n\\t')}}\n{{?}}{{? entity.data.fieldRemoved && entity.data.fieldRemoved.length > 0}}\n 删除字段：\n{{='\\t'}}{{=buildRemovedDesc(entity).join('\\n\\t')}}\n{{?}}\n{{~}}\n{{?}}", - "update": "{{\n let createEntities = it.changes.filter(function(row){return (row.opt==='add'&&row['type']==='entity');});\n let dropEntities = it.changes.filter(function(row){return (row.opt==='delete'&&row['type']==='entity');});\n let modifyEntities = it.changes.filter(function(row){return (row.opt==='update'&&row['type']==='entity');});\n \n function baseChangedDDL(beforeAfter){\n if(beforeAfter == null){\n return '';\n }\n let ret = [];\n let before = beforeAfter.before || {\"defKey\":\"\",\"defName\":\"\",\"comment\":\"\"};\n let after = beforeAfter.after || {\"defKey\":\"\",\"defName\":\"\",\"comment\":\"\"};\n if(before.defKey !== after.defKey){\n ret.push(`EXEC sp_rename '${before.defKey}','${after.defKey}'`);\n }\n let commentText = '';\n let commentChanged = false;\n if(before.defName !== after.defName){\n commentText = after.defName;\n commentChanged = true;\n }\n if(before.comment !== after.comment){\n commentChanged = true;\n if(commentText){\n commentText = (commentText+ ';'+after.comment)\n }else{\n commentText = after.comment\n }\n }\n if(commentChanged){\n let myText = `IF ((SELECT COUNT(*) FROM ::fn_listextendedproperty('MS_Description','SCHEMA', 'dbo','TABLE', '${after.defKey}', NULL, NULL)) > 0)\n \\n\\tEXEC sp_updateextendedproperty 'MS_Description', '${commentText}','SCHEMA', 'dbo','TABLE', '${after.defKey}'\n \\nELSE\n \\n\\tEXEC sp_addextendedproperty 'MS_Description', '${commentText}', 'SCHEMA', 'dbo','TABLE', '${after.defKey}'\n `;\n ret.push(myText);\n /*ret.push('ALTER TABLE '+after.defKey+' COMMENT \\''+commentText+'\\'');*/\n }\n let baseText = '-- 基本信息:\\n';\n return baseText+ret.join(';\\n')+';';\n };\n \n function buildAddedDDL(entity){\n let ret = [];\n let fieldAdded = entity.data.fieldAdded||[];\n if(fieldAdded.length == 0){\n return '';\n }\n \n let firstDDL = `ALTER TABLE [dbo].[${entity.data.baseInfo.defKey}]`;\n for (let field of fieldAdded) { \n let ddlItem = `ADD [${field.defKey}] ${field.dbType}`;\n /*处理数据类型长度*/\n if(field.len>0){\n ddlItem += ('('+field.len);\n if(parseInt(field.scale)>0){\n ddlItem += (','+field.scale);\n }\n ddlItem += ')';\n }\n let defaultValue = field.defaultValue;\n defaultValue = (defaultValue==null)?\"\":(\"\"+defaultValue);\n if(defaultValue.length>0){\n ddlItem += (' DEFAULT ' + defaultValue);\n }\n if(field.notNull){\n ddlItem += ' NOT NULL';\n }\n ret.push(`${firstDDL} ${ddlItem}`);\n \n /*处理字段注释*/\n let fieldComments = [];\n if(field.defName != null &&field.defName.length>0){\n fieldComments.push(field.defName);\n }\n if(field.comment != null &&field.comment.length>0){\n fieldComments.push(field.comment);\n }\n let commentText = fieldComments.join(';');\n if(commentText != null && commentText.length > 0){\n let commentDDL = `EXEC sp_addextendedproperty 'MS_Description', N'${commentText}','SCHEMA', N'dbo','TABLE', N'${entity.data.baseInfo.defKey}','COLUMN', N'${field.defKey}'`;\n ret.push(commentDDL);\n }\n }\n return '\\n'+ret.join(';\\n');\n };\n \n function buildRemovedDDL(entity){\n let ret = [];\n let fieldRemoved = entity.data.fieldRemoved||[];\n if(fieldRemoved.length == 0){\n return '';\n }\n \n let firstDDL = `ALTER TABLE [dbo].[${entity.data.baseInfo.defKey}]`;\n for (let field of fieldRemoved) { \n ret.push(`${firstDDL} DROP COLUMN [${field.defKey}]`);\n }\n return '\\n'+ret.join(';\\n');\n };\n \n function buildModifiedDDL(entity){\n let ret = [];\n let fieldModified = entity.data.fieldModified||[];\n \n let firstDDL = `ALTER TABLE [dbo].[${entity.data.baseInfo.defKey}]`;\n for (let field of fieldModified) { \n let changeDDL = '';\n let before = field.before || {};\n let after = field.after || {};\n if(before.defKey === after.defKey){\n changeDDL += (' ALTER COLUMN ['+after.defKey+']');\n }else{\n let renameText = `EXEC sp_rename '[dbo].[${entity.data.baseInfo.defKey}].[${before.defKey}]','${after.defKey}','COLUMN';`;\n ret.push(renameText);\n continue;\n }\n changeDDL += (' '+after.dbType);\n if(after.len>0){\n changeDDL += ('('+after.len);\n if(parseInt(after.scale)>0){\n changeDDL += (','+after.scale);\n }\n changeDDL += ')';\n }\n let defaultValue = after.defaultValue;\n defaultValue = (defaultValue==null)?\"\":(\"\"+defaultValue);\n if(defaultValue.length>0){\n changeDDL += (' DEFAULT ' + defaultValue);\n }\n \n if(after.notNull){\n changeDDL += ' NOT NULL';\n }\n ret.push(`${firstDDL} ${changeDDL};`);\n }\n return ret;\n };\n}}\n{{? createEntities && createEntities.length > 0}}\n/* --------------- 创建表 --------------- */\n{{~ createEntities:entity}}\n{{=it.func.createDDL(entity.data,entity['type'])}}\n{{~}}\n{{?}}\n\n\n{{? dropEntities && dropEntities.length > 0}}\n/* --------------- 删除表 --------------- */\n{{~ dropEntities:entity}}\n{{=it.func.dropDDL(entity.data,entity['type'])}}\n{{~}}\n{{?}}\n\n\n{{? modifyEntities && modifyEntities.length > 0}}\n{{~ modifyEntities:entity}}\n/* --------------- 修改表 --------------- */\n-- 修改表：{{=entity.data.baseInfo.defKey}}[{{=entity.data.baseInfo.defName}}]\n{{=baseChangedDDL(entity.data.baseChanged)}}\n{{? entity.data.fieldModified && entity.data.fieldModified.length > 0}}\n-- 修改字段：\n{{=buildModifiedDDL(entity).join('\\n')}}\n{{?}}{{\n/*索引是否修改过*/\nlet indexChanged = entity.data.indexChanged;\n}}\n{{? indexChanged }}\n{{=it.func.indexRebuildDDL(entity.data.baseInfo,entity.data.newIndexes,entity.data.fullFields,entity['type'])}}\n{{?}}\n\n{{? entity.data.fieldAdded && entity.data.fieldAdded.length > 0}}\n-- 添加字段：\n{{=buildAddedDDL(entity)}};\n{{?}}\n\n{{? entity.data.fieldRemoved && entity.data.fieldRemoved.length > 0}}\n-- 删除字段：\n{{=buildRemovedDDL(entity)}};\n{{?}}\n{{~}}\n{{?}}" - }, - { - "applyFor": "DFBEC1DD-AA84-456E-BBF3-C95DD0DB2022", - "type": "dbDDL", - "createTable": "DROP TABLE IF EXISTS {{=it.entity.defKey}};\nCREATE TABLE {{=it.entity.defKey}}(\n{{ pkList = [] ; }}\n{{~it.entity.fields:field:index}}\n {{? field.primaryKey }}{{ pkList.push(field.defKey) }}{{?}}\n \"{{=field.defKey}}\" {{? field.autoIncrement}}SERIAL{{??}}{{=field.type}}{{?field.len>0}}{{='('}}{{=field.len}}{{?field.scale>0}}{{=','}}{{=field.scale}}{{?}}{{=')'}}{{?}}{{?}}{{= field.notNull ? ' NOT NULL' : '' }}{{= field.defaultValue ? it.func.join(' DEFAULT ',field.defaultValue,' ') : '' }}{{= index < it.entity.fields.length-1 ? ',' : ( pkList.length>0 ? ',' :'' ) }}\n{{~}}\n{{? pkList.length >0 }}\n PRIMARY KEY ({{~pkList:pkName:i}}{{= pkName }}{{= i'+(after.defKey||'NULL'));\n }\n if(before.defName !== after.defName){\n ret.push('显示名称:'+(before.defName||'NULL')+'->'+(after.defName||'NULL'));\n }\n if(before.comment !== after.comment){\n ret.push('说明:'+(before.comment||'NULL')+'->'+(after.comment||'NULL'));\n }\n if(ret.length>0){\n return ' 基本信息:\\n\\t'+ret.join('\\n\\t');\n }\n return '';\n };\n \n function buildAddedDesc(entity){\n let ret = [];\n let fieldAdded = entity.data.fieldAdded||[];\n \n for (let field of fieldAdded) { \n let row = [];\n row.push(field.defKey+'['+field.defName+']');\n ret.push(row.join(\"\"))\n }\n return ret;\n };\n \n function buildRemovedDesc(entity){\n let ret = [];\n let fieldRemoved = entity.data.fieldRemoved||[];\n \n for (let field of fieldRemoved) { \n let row = [];\n row.push(field.defKey+'['+field.defName+']');\n ret.push(row.join(\"\"))\n }\n return ret;\n };\n \n function buildModifiedDesc(entity){\n let ret = [];\n let fieldModified = entity.data.fieldModified||[];\n \n for (let field1 of fieldModified) { \n let row = [];\n let field = field1.before;\n row.push(field.defKey+'['+field.defName+']');\n ret.push(row.join(\"\"))\n }\n return ret;\n };\n}}\n\n\n{{? createEntities && createEntities.length > 0}}\n/* --------------- 创建表 --------------- */\n{{~ createEntities:entity}}\n{{=entity.data.defKey}}[{{=entity.data.defName}}]\n{{~}}\n{{?}}\n\n\n{{? dropEntities && dropEntities.length > 0}}\n/* --------------- 删除表 --------------- */\n{{~ dropEntities:entity}}\n{{=entity.data.defKey}}[{{=entity.data.defName}}]\n{{~}}\n{{?}}\n\n{{? modifyEntities && modifyEntities.length > 0}}\n/* --------------- 修改表 --------------- */\n{{~ modifyEntities:entity}}\n{{=entity.data.baseInfo.defKey}}[{{=entity.data.baseInfo.defName}}]{{let changeText=baseChanged(entity.data.baseChanged);}}\n{{=baseChanged(entity.data.baseChanged)}}\n {{? entity.data.fieldModified && entity.data.fieldModified.length > 0}}\n 修改字段：\n {{='\\t'}}{{=buildModifiedDesc(entity).join('\\n\\t')}}{{?}}{{\n /*计算是否调整了属性*/\n let propAdded = entity.data.propAdded || [];\n let propRemoved = entity.data.propRemoved || [];\n let propModified = entity.data.propModified || [];\n let changed = propAdded.length>0 || propRemoved.length>0 || propModified.length>0;\n /*计算关联是否调整*/\n let refEntityAdd = entity.data.refEntityAdd || [];\n let refEntityRemoved = entity.data.refEntityRemoved || [];\n let relaArray = [];\n for (let rela of refEntityAdd) {\n relaArray.push('建立关联:'+rela.defKey+'['+rela.defName+']');\n }\n for (let rela of refEntityRemoved) {\n relaArray.push('解除关联:'+rela.defKey+'['+rela.defName+']');\n }\n /*索引是否修改过*/\n let indexChanged = entity.data.indexChanged;\n }}{{=indexChanged?'\\n\\t更改了索引':''}}{{=changed?'\\n\\t更改了属性':''}}{{=relaArray.length>0?('\\n\\t'+relaArray.join('\\n\\t')):''}}\n{{? entity.data.fieldAdded && entity.data.fieldAdded.length > 0}}\n 添加字段：\n{{='\\t'}}{{=buildAddedDesc(entity).join('\\n\\t')}}\n{{?}}{{? entity.data.fieldRemoved && entity.data.fieldRemoved.length > 0}}\n 删除字段：\n{{='\\t'}}{{=buildRemovedDesc(entity).join('\\n\\t')}}\n{{?}}\n{{~}}\n{{?}}", - "update": "{{\n let createEntities = it.changes.filter(function(row){return (row.opt==='add'&&row['type']==='entity');});\n let dropEntities = it.changes.filter(function(row){return (row.opt==='delete'&&row['type']==='entity');});\n let modifyEntities = it.changes.filter(function(row){return (row.opt==='update'&&row['type']==='entity');});\n \n function baseChangedDDL(beforeAfter){\n if(beforeAfter == null){\n return '';\n }\n let ret = [];\n let before = beforeAfter.before || {\"defKey\":\"\",\"defName\":\"\",\"comment\":\"\"};\n let after = beforeAfter.after || {\"defKey\":\"\",\"defName\":\"\",\"comment\":\"\"};\n if(before.defKey !== after.defKey){\n ret.push(`ALTER TABLE ${before.defKey} RENAME TO ${after.defKey}`);\n }\n let commentText = '';\n let commentChanged = false;\n if(before.defName !== after.defName){\n commentText = after.defName;\n commentChanged = true;\n }\n if(before.comment !== after.comment){\n commentChanged = true;\n if(commentText){\n commentText = (commentText+ ';'+after.comment)\n }else{\n commentText = after.comment\n }\n }\n if(commentChanged){\n let myText = `COMMENT ON TABLE ${after.defKey} IS '${commentText}'`;\n ret.push(myText);\n }\n let baseText = '-- 基本信息:\\n';\n return baseText+ret.join(';\\n')+';';\n };\n \n function buildAddedDDL(entity){\n let ret = [];\n let fieldAdded = entity.data.fieldAdded||[];\n if(fieldAdded.length == 0){\n return '';\n }\n \n let firstDDL = `ALTER TABLE ${entity.data.baseInfo.defKey}`;\n for (let field of fieldAdded) { \n let ddlItem = `ADD COLUMN ${field.defKey} ${field.dbType}`;\n /*处理数据类型长度*/\n if(field.len>0){\n ddlItem += ('('+field.len);\n if(parseInt(field.scale)>0){\n ddlItem += (','+field.scale);\n }\n ddlItem += ')';\n }\n if(field.notNull){\n ddlItem += ' NOT NULL';\n } \n let defaultValue = field.defaultValue;\n defaultValue = (defaultValue==null)?\"\":(\"\"+defaultValue);\n if(defaultValue.length>0){\n ddlItem += (' DEFAULT ' + defaultValue);\n }\n\n ret.push(`${firstDDL} ${ddlItem}`);\n \n /*处理字段注释*/\n let fieldComments = [];\n if(field.defName != null &&field.defName.length>0){\n fieldComments.push(field.defName);\n }\n if(field.comment != null &&field.comment.length>0){\n fieldComments.push(field.comment);\n }\n let commentText = fieldComments.join(';');\n if(commentText != null && commentText.length > 0){\n let commentDDL = `COMMENT ON COLUMN ${entity.data.baseInfo.defKey}.${field.defKey} IS '${commentText}'`;\n ret.push(commentDDL);\n }\n }\n return '\\n'+ret.join(';\\n');\n };\n \n function buildRemovedDDL(entity){\n let ret = [];\n let fieldRemoved = entity.data.fieldRemoved||[];\n if(fieldRemoved.length == 0){\n return '';\n }\n \n let firstDDL = `ALTER TABLE ${entity.data.baseInfo.defKey}`;\n for (let field of fieldRemoved) { \n ret.push(`${firstDDL} DROP COLUMN ${field.defKey}`);\n }\n return '\\n'+ret.join(';\\n');\n };\n \n function buildModifiedDDL(entity){\n let ret = [];\n let fieldModified = entity.data.fieldModified||[];\n \n let firstDDL = `ALTER TABLE ${entity.data.baseInfo.defKey}`;\n for (let field of fieldModified) { \n let before = field.before || {};\n let after = field.after || {};\n if(before.defKey !== after.defKey){\n let renameText = `ALTER TABLE ${entity.data.baseInfo.defKey} RENAME COLUMN ${before.defKey} TO ${after.defKey};`;\n ret.push(renameText);\n }\n /*如果没有变化，则不生成变更语句*/\n if(before.dbType === after.dbType \n && before['len'] === after['len'] \n && before.scale === after.scale\n && before.primaryKey === after.primaryKey\n && before.notNull === after.notNull\n && before.autoIncrement === after.autoIncrement\n && before.defaultValue === after.defaultValue){\n continue;\n }\n if(before.dbType !== after.dbType || before.len !== after.len || before.scale !== after.scale){\n let dbTypeDDL = `ALTER TABLE ${entity.data.baseInfo.defKey} ALTER COLUMN ${after.defKey} TYPE ${before.dbType}`;\n if(after.len>0){\n dbTypeDDL += ('('+after.len);\n if(parseInt(after.scale)>0){\n dbTypeDDL += (','+after.scale);\n }\n dbTypeDDL += ')';\n }\n ret.push(dbTypeDDL+';');\n }\n \n if(before.defaultValue !== after.defaultValue){\n let defaultDDL = '';\n let defaultValue = after.defaultValue;\n defaultValue = (defaultValue==null)?\"NULL\":(\"\"+defaultValue);\n if(defaultValue.length>0){\n defaultDDL += ('SET DEFAULT ' + defaultValue);\n }\n let defaultTpl = `ALTER TABLE ${entity.data.baseInfo.defKey} ALTER COLUMN ${defaultDDL};`;\n ret.push(defaultTpl);\n }\n \n if(before.notNull !== after.notNull){\n let notNullDDL= 'SET NULL';\n if(after.notNull){\n let notNullDDL= 'SET NOT NULL';\n }\n let notNullTpl = `ALTER TABLE ${entity.data.baseInfo.defKey} ALTER COLUMN ${notNullDDL};`;\n ret.push(notNullTpl);\n }\n }\n return ret;\n };\n}}\n{{? createEntities && createEntities.length > 0}}\n/* --------------- 创建表 --------------- */\n{{~ createEntities:entity}}\n{{=it.func.createDDL(entity.data,entity['type'])}}\n{{~}}\n{{?}}\n\n\n{{? dropEntities && dropEntities.length > 0}}\n/* --------------- 删除表 --------------- */\n{{~ dropEntities:entity}}\n{{=it.func.dropDDL(entity.data,entity['type'])}}\n{{~}}\n{{?}}\n\n\n{{? modifyEntities && modifyEntities.length > 0}}\n{{~ modifyEntities:entity}}\n/* --------------- 修改表 --------------- */\n-- 修改表：{{=entity.data.baseInfo.defKey}}[{{=entity.data.baseInfo.defName}}]\n{{=baseChangedDDL(entity.data.baseChanged)}}\n{{? entity.data.fieldModified && entity.data.fieldModified.length > 0}}\n-- 修改字段：\n{{=buildModifiedDDL(entity).join('\\n')}}\n{{?}}{{\n/*索引是否修改过*/\nlet indexChanged = entity.data.indexChanged;\n}}\n{{? indexChanged }}\n-- 索引重建\n{{=it.func.indexRebuildDDL(entity.data.baseInfo,entity.data.newIndexes,entity.data.fullFields,entity['type'])}}\n{{?}}\n\n{{? entity.data.fieldAdded && entity.data.fieldAdded.length > 0}}\n-- 添加字段：\n{{=buildAddedDDL(entity)}};\n{{?}}\n\n{{? entity.data.fieldRemoved && entity.data.fieldRemoved.length > 0}}\n-- 删除字段：\n{{=buildRemovedDDL(entity)}};\n{{?}}\n{{~}}\n{{?}}" - }, - { - "type": "dbDDL", - "applyFor": "89504F5D-94BF-4C9E-8B2E-44F37305FED5", - "createTable": "CREATE TABLE {{=it.entity.defKey}}(\n{{ pkList = [] ; }}\n{{~it.entity.fields:field:index}}\n {{? field.primaryKey }}{{ pkList.push(field.defKey) }}{{?}}\n {{=field.defKey}} {{=field.type}}{{?field.len>0}}{{='('}}{{=field.len}}{{?field.scale>0}}{{=','}}{{=field.scale}}{{?}}{{=')'}}{{?}}{{= field.notNull ? ' NOT NULL' : '' }}{{= field.autoIncrement ? '' : '' }}{{= field.defaultValue ? it.func.join(' DEFAULT ',field.defaultValue,' ') : '' }}{{= index < it.entity.fields.length-1 ? ',' : ( pkList.length>0 ? ',' :'' ) }}\n{{~}}\n{{? pkList.length >0 }}\n PRIMARY KEY ({{~pkList:pkName:i}}{{= pkName }}{{= i0}}{{='('}}{{=field.len}}{{?field.scale>0}}{{=','}}{{=field.scale}}{{?}}{{=')'}}{{?}}{{= field.notNull ? ' NOT NULL' : '' }}{{= field.autoIncrement ? '' : '' }}{{= field.defaultValue ? it.func.join(' DEFAULT ','('+field.defaultValue+')',' ') : '' }}{{= index < it.entity.fields.length-1 ? ',' : ( pkList.length>0 ? ',' :'' ) }}\n{{~}}\n{{? pkList.length >0 }}\n PRIMARY KEY ({{~pkList:pkName:i}}{{= pkName }}{{= i0}}{{='('}}{{=field.len}}{{?field.scale>0}}{{=','}}{{=field.scale}}{{?}}{{=')'}}{{?}}{{= field.notNull ? ' NOT NULL' : '' }}{{= field.autoIncrement ? ' AUTO_INCREMENT' : '' }}{{= field.defaultValue ? it.func.join(' DEFAULT ',field.defaultValue,' ') : '' }}{{= index < it.entity.fields.length-1 ? ',' : ( pkList.length>0 ? ',' :'' ) }}\n{{~}}\n{{? pkList.length >0 }}\n PRIMARY KEY ({{~pkList:pkName:i}}{{= pkName }}{{= i0}}{{='('}}{{=field.len}}{{?field.scale>0}}{{=','}}{{=field.scale}}{{?}}{{=')'}}{{= field.defaultValue ? it.func.join(' DEFAULT ',field.defaultValue,' ') : '' }}{{?}}{{= field.notNull ? ' NOT NULL' : '' }}{{= index < it.entity.fields.length-1 ? ',' : ( pkList.length>0 ? ',' :'' ) }}\n{{~}}\n{{? pkList.length >0 }}\n PRIMARY KEY ({{~pkList:pkName:i}}{{= pkName }}{{= i0 ? ',' :'' ) }}\n{{~}}\n{{? pkList.length >0 }}\n PRIMARY KEY ({{~pkList:pkName:i}}{{= pkName }}{{= i0}}{{='('}}{{=field.len}}{{?field.scale>0}}{{=','}}{{=field.scale}}{{?}}{{=')'}}{{?}} {{= field.notNull ? 'NOT NULL' : '' }} {{= field.autoIncrement ? 'AUTOINCREMENT' : '' }} {{= field.defaultValue ? it.func.join('DEFAULT',field.defaultValue,' ') : '' }}{{= index < it.entity.fields.length-1 ? ',' : ( pkList.length>0 ? ',' :'' ) }} --{{=it.func.join(field.defName,field.comment,';')}}\n{{~}}\n{{? pkList.length >0 }}\n PRIMARY KEY ({{~pkList:pkName:i}}{{= pkName }}{{= i0只有为decimal类型或double类型时才保留长度和小数的位数*/\n{{~it.entity.fields:field:index}}\n {{=it.func.lowerCase(field.defKey)}} {{=it.func.lowerCase(field.dbType)=='varchar'||it.func.lowerCase(field.dbType)=='char'||it.func.lowerCase(field.dbType)=='text'||it.func.lowerCase(field.dbType)=='date'||it.func.lowerCase(field.dbType)=='datetime' ? 'string':it.func.lowerCase(field.dbType)=='tinyint unsigned'||it.func.lowerCase(field.dbType)=='bit'||it.func.lowerCase(field.dbType)=='integer'||it.func.lowerCase(field.dbType)=='tinyint'||it.func.lowerCase(field.dbType)=='smallint'||it.func.lowerCase(field.dbType)=='mediumint' ? 'int':it.func.lowerCase(field.dbType)=='int unsigned' ? 'bigint':it.func.lowerCase(field.dbType)}}{{?field.len>0&&(it.func.lowerCase(field.dbType)=='decimal'||it.func.lowerCase(field.dbType)=='double')}}{{='('}}{{=field.len}}{{?field.scale>0}}{{=','}}{{=field.scale}}{{=')'}}{{?}}{{?}} comment '{{=it.func.join(field.defName,field.comment,'')}}' {{= index < it.entity.fields.length-1 ? ',' : ( pkList.length>0 ? ',' :'' ) }}\n{{~}}\n{{? pkList.length >0 }}\n{{?}}\n)\n{{\n let partitionedBy = it.entity.properties['partitioned by'];\n partitionedBy = partitionedBy?partitionedBy:'请在扩展属性中配置[partitioned by]属性';\n}}\ncomment '{{=it.func.join(it.entity.defName,';') }}'\n/**是否分区表,分区字段名和字段注释自定义*/\n[partitioned by {{=partitionedBy}}]\n/**文件存储格式自定义*/\n[stored as orc]\n/**hdfs上的地址自定义*/\n[location xxx]\n;", - "createView": "", - "deleteTable": "", - "createIndex": "", - "deleteIndex": "", - "message": "", - "update": "" - }, - { - "applyFor": "B91D99E0-9B7C-416C-8737-B760957DAF09", - "type": "appCode", - "content": "{{\n var today=new Date();\n var fullYear=today.getFullYear();\n var month=today.getMonth() + 1<10?\"0\"+today.getMonth():today.getMonth();\n var days=today.getDate()<10?\"0\"+today.getDate():today.getDate();\n var hours = today.getHours()<10?\"0\"+today.getHours():today.getHours(); \n\tvar minutes = today.getMinutes()<10?\"0\"+today.getMinutes():today.getMinutes(); \n\tvar seconds = today.getSeconds()<10?\"0\"+today.getSeconds():today.getSeconds(); \n}}\n// Package models {{=it.func.join(it.entity.defName,it.entity.comment,'，')}}\n// author : http://www.liyang.love\n// date : {{=fullYear}}-{{=month}}-{{=days}} {{=hours}}:{{=minutes}}\n// desc : {{=it.func.join(it.entity.defName,it.entity.comment,'，')}}\npackage models\n\n$blankline\n\n// {{=it.func.camel(it.entity.defKey,true) }} {{=it.func.join(it.entity.defName,it.entity.comment,'，')}}。\n// 说明:{{=it.entity.comment}}\n// 表名:{{=it.entity.defKey}}\n// group: {{=it.func.camel(it.entity.defKey,true) }}\n// obsolete:\n// appliesto:go 1.8+;\n// namespace:hongmouer.his.models.{{=it.func.camel(it.entity.defKey,true) }}\n// assembly: hongmouer.his.models.go\n// class:HongMouer.HIS.Models.{{=it.func.camel(it.entity.defKey,true) }}\n// version:{{=fullYear}}-{{=month}}-{{=days}} {{=hours}}:{{=minutes}}\ntype {{=it.func.camel(it.entity.defKey,true) }} struct {\n {{~it.entity.fields:field:index}}\n {{=formatGoLang(it.func.camel(field.defKey,true),null,field,it.entity.fields,null,1)}} {{=formatGoLang(field.type,\"type\",field,it.entity.fields,10,3)}} `gorm:\"column:{{=field.primaryKey?\"primaryKey;\":\"\"}}{{=field.defKey}}\" json:\"{{=it.func.camel(field.defKey,true)}}\"` {{=formatGoLang(\"gorm:column:\"+field.defKey+\" json:\"+it.func.camel(field.defKey,true),null,field,it.entity.fields,null,2)}} //type:{{=formatGoLang(field.type,\"type\",field,it.entity.fields,null,3)}} comment:{{=formatGoLang(it.func.join(field.defName,field.comment,';'),\"defName\",field,it.entity.fields,null,4)}} version:{{=fullYear}}-{{=month}}-{{=days}} {{=hours}}:{{=minutes}}\n {{~}}\n}\n\n\n$blankline\n// TableName 表名:{{=it.entity.defKey}}，{{=it.entity.defName}}。\n// 说明:{{=it.entity.comment}}\nfunc (ZentaoUserInfo) TableName() string {\n\treturn \"{{=it.entity.defKey}}\"\n}\n\n{{\n\nfunction formatGoLang(str, fieldName, field, fileds, emptLength, isFiled) {\n var maxLength = 0;\n\n if (isFiled == 1) {\n for (var i = 0; i < fileds.length; i++) {\n if (getBlength(it.func.camel(fileds[i].defKey, true)) > maxLength) {\n maxLength = getBlength(it.func.camel(fileds[i].defKey, true)) + 2;\n }\n }\n } else if (isFiled == 2) {\n for (var i = 0; i < fileds.length; i++) {\n var newStr = \"gorm:column:\" + fileds[i].defKey + \" json:\" + it.func.camel(fileds[i].defKey, true);\n if (getBlength(newStr) > maxLength) {\n maxLength = getBlength(newStr) + 2;\n }\n }\n var empt = \"\";\n var strLength = getBlength(str);\n if (field.primaryKey) {\n strLength += getBlength(\"primaryKey;\");\n }\n for (var j = 0; j < maxLength - strLength; j++) {\n empt += ' ';\n }\n return empt;\n } else if (isFiled == 3) {\n /*获取某个字段的最大长度*/\n for (var i = 0; i < fileds.length; i++) {\n var newStr = eval(\"fileds[\" + i + \"].\" + fieldName);\n if (getBlength(newStr) > maxLength) {\n maxLength = getBlength(newStr) + 1;\n }\n }\n } else if (isFiled == 4) {\n /*获取某个字段的最大长度*/\n for (var i = 0; i < fileds.length; i++) {\n var newStr = fileds[i].comment + \";\" + fileds[i].defName;\n if (getBlength(newStr) > maxLength) {\n maxLength = getBlength(newStr) + 1;\n }\n }\n }\n else {\n maxLength = emptLength;\n }\n\n var strLength = getBlength(str);\n for (var j = 0; j < maxLength - strLength; j++) {\n str += ' ';\n }\n return str;\n}\n\nfunction getBlength(str) {\n var n = 0;\n for (var i = str.length; i--;) {\n n += str.charCodeAt(i) > 255 ? 2 : 1;\n }\n return n;\n} \n\n}}" - } - ], - "generatorDoc": { - "docTemplate": "" - }, - "relationFieldSize": 100, - "uiHint": [ - { - "defKey": "Input", - "defName": "普通输入框", - "id": "642D2E0A-8846-4549-BE56-8C0473F26EDE" - }, - { - "defKey": "Select", - "defName": "下拉输入框", - "id": "FB111359-2B73-4443-926C-08A98E446448" - }, - { - "defKey": "CheckBox", - "defName": "复选框", - "id": "0CB8A6C9-1115-4FC0-B51E-5C028065082F" - }, - { - "defKey": "RadioBox", - "defName": "单选框", - "id": "5C04987A-260F-4B7C-A5D5-22A181AAE9CA" - }, - { - "defKey": "Double", - "defName": "小数输入", - "id": "8D5BAFE4-E15C-4707-A047-8EE59C58E70F" - }, - { - "defKey": "Integer", - "defName": "整数输入", - "id": "9999AF2A-A44E-415C-A2DC-D7C613BD0073" - }, - { - "defKey": "Money", - "defName": "金额输入", - "id": "2B0C3D0C-7BAF-4B36-81AD-9362B5E5DC2E" - }, - { - "defKey": "Date", - "defName": "日期输入", - "id": "E4D94E14-F695-487F-AFC2-4D888009B7DA" - }, - { - "defKey": "DataYearMonth", - "defName": "年月输入", - "id": "936927E3-DD2D-4096-87FD-074CDE278D59" - }, - { - "defKey": "Text", - "defName": "长文本输入", - "id": "D89DD4F1-ADAC-4469-BF8D-B3FF41AE7963" - }, - { - "defKey": "RichText", - "defName": "富文本输入", - "id": "C134EB1F-4CFF-49E0-882F-2C6FB275CB20" - } - ], - "headers": [ - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true, - "enable": false - } - ], - "menuWidth": "371px", - "modelType": "modalAll", - "extAttrProps": { - "attr1": { - "editType": "", - "optionsData": "", - "optionsFetcher": "" - }, - "attr2": { - "editType": "", - "optionsData": "", - "optionsFetcher": "" - }, - "attr3": { - "editType": "", - "optionsData": "", - "optionsFetcher": "" - }, - "attr4": { - "editType": "", - "optionsData": "", - "optionsFetcher": "" - }, - "attr5": { - "editType": "", - "optionsData": "", - "optionsFetcher": "" - }, - "attr6": { - "editType": "", - "optionsData": "", - "optionsFetcher": "" - }, - "attr7": { - "editType": "", - "optionsData": "", - "optionsFetcher": "" - }, - "attr8": { - "editType": "", - "optionsData": "", - "optionsFetcher": "" - }, - "attr9": { - "editType": "", - "optionsData": "", - "optionsFetcher": "" - } - } - }, - "entities": [ - { - "id": "3B2F5CEA-2417-4369-B801-44E8CEF2937D", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_company", - "defName": "公司管理", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "2A632BC5-4D3E-4E2D-8563-360864DE7CEA", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "parent_id", - "defName": "父公司ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "id": "CB6E1B85-94A8-43E2-8F35-DE07BD598FA0", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_code", - "defName": "公司编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": null, - "extProps": {}, - "id": "CED73178-24F4-456A-A27F-20112CD15742", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "company_name", - "defName": "公司名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "refDict": null, - "extProps": {}, - "id": "8DECDA06-A71B-414D-86C5-176C9B426893", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "company_name_en", - "defName": "公司英文名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "24D08A55-0479-42BE-AB34-6E627D8F9EE7", - "uiHint": null - }, - { - "defKey": "company_remark", - "defName": "公司描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "7B9E23CC-474F-46DB-A76F-F577FA69DE47", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "company_remark_en", - "defName": "公司英文描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "4E3DD2BC-F715-4BAE-8FDE-B383CD3894A3", - "uiHint": null - }, - { - "defKey": "company_address", - "defName": "公司地址", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "0EBA4BF5-E3F9-4A67-BBCD-BF76FDAF30B8", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "company_address_en", - "defName": "公司英文地址", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "922BFB29-7536-4B35-B274-D676178908B0", - "uiHint": null - }, - { - "defKey": "company_postcode", - "defName": "公司邮编", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "31DA40EC-3DDE-4FA2-A672-FAC0E2BCD8A9", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "company_fax", - "defName": "传真号码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "D8829E4E-4DD0-4892-A769-76E1218637E1", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "company_wechat", - "defName": "微信二维码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "ACCA14DE-7421-490A-847D-1765237C905C", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "company_blicense", - "defName": "统一信用社会代码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "EB6DA33C-B018-4FB0-BD59-6EA4599042A4", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "company_other", - "defName": "其它信息", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "13E71FFD-1F17-42AF-A118-9A332D5BB219", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "company_head_id", - "defName": "公司法人ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "id": "3088F433-D098-4AC2-A1E6-09821D24D01D", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_head_code", - "defName": "公司法人工号", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "9B896D76-F9B4-4F08-8941-ACE6E10C5261", - "uiHint": null - }, - { - "defKey": "mobile", - "defName": "手机号码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "0CC3D9F0-05E6-4148-905E-B880E2EFA0C5", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "phone", - "defName": "电话号码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "refDict": null, - "extProps": {}, - "id": "BF28B19F-0B91-43E4-B4FE-32432DD6155B", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "email", - "defName": "电子邮箱", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "refDict": null, - "extProps": {}, - "id": "E3EE18A3-4381-4050-81D3-62DD394F5E86", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "sort", - "defName": "显示顺序", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "65303E6C-8BE0-44F9-8184-689D9AE6D345", - "refDict": null, - "extProps": {}, - "id": "652EB5C0-CBA8-48FB-A800-DD40FC015BE5", - "baseType": "6C3C997C-D2EB-435C-8B83-08A14EB3BD1A", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "D6EF30D0-ABFB-49F2-87B8-781F67E55A9C", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "DA9D5971-F110-4791-940E-988BB85BE161", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "9A5AFDAB-2D13-48AC-B3A8-7042E88F5852", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "9D13C826-3B8D-4DD0-BE3D-2949BEF02D07", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "8F8500B6-BFE9-4E14-9203-4C48C1F758E4", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "372EA807-7371-4EDE-897E-465E51539BA4", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "DE23B320-C813-4AFE-8E44-91885C410818", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "AB5913F8-2F59-4898-9291-0D4C36CA6F4E", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "C97789CB-0EA2-4B23-867F-D7FE6A648CBF", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "216FE788-B005-4A62-8454-DEC889EEC7F2", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_dept", - "defName": "部门管理", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "0162B3D8-A57D-4BB0-BA62-B93D186D5F40", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "parent_id", - "defName": "父部门ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "id": "28295F3E-DE3F-4E78-BB33-4AAE4C788C6C", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "dept_code", - "defName": "部门编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "637F72DD-E1BB-45CC-9F66-45B74C534E66", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "dept_name", - "defName": "部门名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "refDict": null, - "extProps": {}, - "id": "8430BDB1-BC94-4DFB-A0B2-3B947036BBE4", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "dept_name_en", - "defName": "部门英文名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "74EFCFC6-A6FF-4563-BE60-A3BB8E87FA02", - "uiHint": null - }, - { - "defKey": "dept_head_id", - "defName": "部门领导ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "id": "E41F92D9-6258-48BC-9967-A228860F3F8B", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "dept_head_code", - "defName": "部门领导工号", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": null, - "extProps": {}, - "id": "BACC9201-098A-4AC3-991A-BD8063501BF0", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "sort", - "defName": "显示顺序", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "65303E6C-8BE0-44F9-8184-689D9AE6D345", - "refDict": null, - "extProps": {}, - "id": "97A169F7-1C55-4638-9955-B896FEAD0DE0", - "baseType": "6C3C997C-D2EB-435C-8B83-08A14EB3BD1A", - "uiHint": null - }, - { - "defKey": "phone", - "defName": "联系电话", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "75A92C83-AB68-44EA-A536-ED0CA6D0CD60", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "email", - "defName": "联系邮箱", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "BED6DD9E-B1F6-4C7D-9E98-B793073FE2A1", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "EFC1C366-3D1B-4EB5-A32D-EC5536B6BE00", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "9C9E76C6-22ED-4765-81EB-38EF9F941703", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "D7DCFB7A-FD21-4819-BD6F-38F9633627BC", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "64F95A1F-F049-4C81-AB11-00BA74F7E775", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "362832EF-B81E-4ACA-AE43-93101D2C600C", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "27E2DA2E-6C8A-4E69-8F1A-02916FB19C74", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "77C9F4B3-449B-4CCB-B851-3BA09CBDB466", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "54966344-73E9-4620-8571-E9B1B0C48669", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "E9EEA18C-1239-4A38-8F27-1A4501622B8D", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "652BBA45-496C-406E-B371-9AFC8A38E6C9", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_grade", - "defName": "职系管理", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "F19AB899-C199-4E00-966C-2DD9DB390D3C", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "grade_code", - "defName": "职系编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "9443CA30-A5B1-4815-9BAC-7BEBCB99BE02", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "grade_name", - "defName": "职系名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "19A2B0DA-4576-4E4B-AC44-81E13B22D696", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "grade_name_en", - "defName": "职系英文名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "C3FFA4C7-55FB-4A6A-807A-A80C9487F165", - "uiHint": null - }, - { - "defKey": "grade_remark", - "defName": "职系描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "85988104-641A-4912-B70D-3F87CFCDE0D3", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "grade_remark_en", - "defName": "职系英文描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "857706A2-E310-46C9-BF40-990C0AD5E4BF", - "uiHint": null - }, - { - "defKey": "sort", - "defName": "显示顺序", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "65303E6C-8BE0-44F9-8184-689D9AE6D345", - "id": "DE05D4F5-B17F-4697-A346-9212314B3877", - "baseType": "6C3C997C-D2EB-435C-8B83-08A14EB3BD1A", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "9EAE6A6A-93B3-46FC-BB41-67B2BC37B1E0", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "51AD8F39-6958-44EE-9004-A449CC8B8F60", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "A49BCA6C-7B55-4B89-BFAC-3EBE8A26C232", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "E11F138A-A76B-4BB6-91A5-0AE3AF7FD3BC", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "D71036DF-9274-4BF9-92EF-B7730C698A2B", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "7AD57B3C-CF27-4C1F-8568-B473DB574A83", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "BFB1AB50-22BC-4715-83D3-6171A0F1FB2C", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "00BE5590-93BB-47E5-9BA9-3776B6C11D0E", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "D598AA6C-FF0A-43BB-AA3D-67F101F810DA", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "DB399458-8885-4780-91A9-C2D296B849EE", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_position", - "defName": "职位管理", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "0C78CEF7-ED78-4F24-899D-44F3CD74C7CA", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "grade_id", - "defName": "职系ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "8A92CEFA-587A-40E3-B66B-E46AF4ADA931", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "grade_code", - "defName": "职系编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "CF36FB9C-2016-4588-A20B-60B2E3170FBF", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "position_code", - "defName": "职位编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "F9B5A04C-181D-490D-ADF7-46F981C59191", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "position_name", - "defName": "职位名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "E9170A1E-5974-401B-92D4-59A6DE80EE15", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "position_name_en", - "defName": "岗位英文名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "B99E8042-A27C-430D-9381-A23BF4DC4C82", - "uiHint": null - }, - { - "defKey": "position_remark", - "defName": "职位描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "DB56C3DB-FF30-41C0-A337-A31EFAC86CBD", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "position_remark_en", - "defName": "职位英文描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "85783AE2-ABB3-48EB-91F6-82E6354614C4", - "uiHint": null - }, - { - "defKey": "sort", - "defName": "显示顺序", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "65303E6C-8BE0-44F9-8184-689D9AE6D345", - "id": "B15DC310-610F-40F5-A64E-46DD9A1C13D0", - "baseType": "6C3C997C-D2EB-435C-8B83-08A14EB3BD1A", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "8CE64564-D272-489A-8BF3-A13244EC55CA", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "0B2ED870-C44E-4D63-B6FF-2E8B6C5A468F", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "A3A58E17-18F8-41BB-8DC4-39951EB14098", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "28E8C087-13B5-4728-A0A7-49B550555EEB", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "E3A246B2-01AE-41DB-87A6-0EACBC70CF0D", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "48EEA081-A5ED-40E6-BBB7-F428FBCC9A8A", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "BFE543EC-DDC2-4052-9F0D-7951A38897D8", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "8F8EAFE8-1EF8-4375-8FB9-98FA1D451C00", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "EC43FF70-A907-421E-AA80-96CA7D13F65C", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "73D14190-2AF6-4483-8551-FB05017F971F", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_rank", - "defName": "职级管理", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "C980F665-8803-4C60-A5F2-8D23ED54ABEA", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "position_id", - "defName": "职位ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "154DFA59-8019-4DEB-A046-DFBEB4EA97D6", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "position_code", - "defName": "职位编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "2EDFCDC5-7653-409E-AACF-0ABB26D55ECF", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "rank_code", - "defName": "职级编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "0C04029E-0A20-4CE8-8B8A-C1F6129DAFE7", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "rank_name", - "defName": "职级名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "52DF2057-5867-41CF-BBE7-57F216B515D2", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "rank_name_en", - "defName": "职级英文名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "7A7815D7-FB8A-4475-A740-C9BB4F90BAFE", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "rank_remark", - "defName": "职级描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "C81EE457-23AE-4B9D-B78D-02D54D3310FB", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "rank_remark_en", - "defName": "职级英文描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "E28030D8-7266-4DA6-96E7-FF1289871C91", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "sort", - "defName": "显示顺序", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "65303E6C-8BE0-44F9-8184-689D9AE6D345", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "5E32D668-A8BB-43B7-BE10-E50A9C1818B5", - "baseType": "6C3C997C-D2EB-435C-8B83-08A14EB3BD1A", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "6BE32628-5235-4935-9F57-C325766FB5AF", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "B4EF18FC-89F8-428B-B077-0FEB681E247B", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "808754C4-A1F7-49FA-88EE-49D36C1AD7BB", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "EFF34EF2-5FFB-4B25-852F-8E54F3E52FEA", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "0D6B79AC-12F4-4013-868C-A89DB7D30FC5", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "44A7FF19-F7AF-4137-A41A-7477D7D1CF84", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "4742650F-CC72-470A-A8F0-ACC4AD66AC68", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "B2E47DD8-FF09-49CA-B85F-9C3F03A82D82", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "A295CA3F-C824-4DF6-BDD3-14CA562BBF84", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - }, - { - "id": "F2125A91-B961-4C4D-8D13-3E0A2533944B", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_user", - "defName": "用户管理", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "E6BC3D5B-9881-4469-978C-13D38D40ABA5", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "user_code", - "defName": "用户编码/员工工号", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "EBB47498-3D33-4D68-A539-D6B5AAB0F7DB", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "login_name", - "defName": "登录账号", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "id": "B08AC264-C6EE-4DB2-B4F5-0EF7876914D2", - "uiHint": null - }, - { - "defKey": "user_name", - "defName": "用户名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "id": "C704E579-D7EF-4F77-AF45-8A6935B8C723", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "user_name_en", - "defName": "用户英文名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "445E8DE7-8D8A-460E-9043-2B24BEC43424", - "uiHint": null - }, - { - "defKey": "first_name", - "defName": "用户首名（东方为姓，西方为名）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "E1DB3CC6-1CAA-4D9C-8761-30C97262F034", - "uiHint": null - }, - { - "defKey": "middle_name", - "defName": "用户中名（欧美人常用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "15A475FB-06C8-4BC0-9FE6-0A88413AF1A9", - "uiHint": null - }, - { - "defKey": "last_name", - "defName": "用户末名（东方为名，西方为姓）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "0B566C16-23E9-4A30-B1BC-8EA96A289632", - "uiHint": null - }, - { - "defKey": "nick_name", - "defName": "用户昵称/别号", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "41AD0B8A-C199-4A03-A73F-4D7B568C3A7A", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "user_remark", - "defName": "用户描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "ED2DAB48-4D32-426C-B4E8-4FE9821F7587", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "password", - "defName": "登录密码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "2CE50A93-D93F-498C-A0A8-89DDB417D4CD", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "birthday", - "defName": "出生日期", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098", - "extProps": {}, - "domain": "314093CD-F021-4772-81C0-AB65BBE81F4B", - "id": "C5124BD9-37A1-4EBF-91BD-CE2608F27CC0", - "uiHint": null - }, - { - "defKey": "identity", - "defName": "证件号码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "9659AB6B-35DC-46EE-AB12-1B0A6C40F2BC", - "uiHint": null - }, - { - "defKey": "email", - "defName": "电子邮箱", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "refDict": null, - "extProps": {}, - "id": "1E32EF84-FC99-4E8F-AA23-B5C69E193290", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "landline", - "defName": "办公座机", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "7E722609-6645-4923-9000-66C133068549", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "phone", - "defName": "电话号码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "refDict": null, - "extProps": {}, - "id": "1EAD2A51-CB30-4CF3-BD65-DEB759775759", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "wx", - "defName": "微信", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "A81CC4B6-C764-4FB5-A0B0-BB4B6550B6F1", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "qq", - "defName": "QQ", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "239645DF-7833-4423-88A0-6EB51277F544", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "sex", - "defName": "用户性别（0女性 1男性 2未知）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "7FCA70FD-7C0E-4A9D-97C6-1FEDFDA75C6D", - "id": "027ACE06-F6FF-4D9F-88EA-F7C032FFCDBA", - "baseType": "CE1004FF-CF1C-4DEB-B661-1B5D5474E0B8", - "uiHint": null - }, - { - "defKey": "head_pic", - "defName": "头像地址", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "3E84681B-9E8B-470C-A584-7DC5D9DE9E52", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "login_ip", - "defName": "最后登录IP", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "450A849D-B14B-447A-97FE-CCDB9D60453A", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "login_date", - "defName": "最后登录时间", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "id": "886410B6-B11E-4150-AB97-9E6C63365FC8", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "3A11FE93-7635-42D6-AB22-10142BB02EF9", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "F2D0A62E-EC53-48E5-8C7B-41DD003378F8", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "F30D2729-22BF-40D0-8FE5-8BB752761EAC", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "A713E73A-479D-492B-AF11-DF42A4AA10B4", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "14DF61BE-2D03-445D-9AEE-55947FEC38E8", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "A8ABC68A-D87D-4E77-85B9-EC59429121A8", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "C53A0371-B1DB-4A38-B763-19741185CEE7", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "83FF7A34-F278-4DB6-B8AB-0F0EDC48E761", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "7CF66358-A47D-4136-894E-91C106A6AD55", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "1B15A892-70F3-4A4A-8E8E-8CA16F920B74", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_group", - "defName": "业务组织", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "96DC0F05-251A-4F30-A4B1-BC70F4B31863", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "parent_id", - "defName": "父组织ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": "", - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "40667D9F-F9B6-40C6-AF23-5007A1A03573", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "group_code", - "defName": "组织编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": null, - "extProps": {}, - "id": "7E5FA4C0-75FF-47FD-9C8B-1F5A5BA4A7D9", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "group_name", - "defName": "组织名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "refDict": null, - "extProps": {}, - "id": "78FACFE2-F90C-4DFA-8AEB-3B74AFF7EEBA", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "group_name_en", - "defName": "组织英文名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "06F994B5-8D5E-4BB6-BFC0-47C4DA720E90", - "uiHint": null - }, - { - "defKey": "group_remark", - "defName": "组织描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "refDict": null, - "extProps": {}, - "id": "D813E4CF-C6B4-4DA4-B84D-A3210012B176", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "group_remark_en", - "defName": "组织英文描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "5296A7C1-D58D-4B2D-B762-9272695F4E8D", - "uiHint": null - }, - { - "defKey": "sort", - "defName": "显示顺序", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "65303E6C-8BE0-44F9-8184-689D9AE6D345", - "refDict": null, - "extProps": {}, - "id": "EDA83011-6E67-4C26-A513-D2619E6F39A5", - "baseType": "6C3C997C-D2EB-435C-8B83-08A14EB3BD1A", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "D5C8514B-EF77-4035-9235-4A076DE7C7A0", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "90DE54A9-2380-4500-A098-7C21418A0019", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "7B3CE78B-7070-4DB0-ABB5-FA0BF1E6A457", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "98A2C0BB-D901-4C58-B080-AC23DE36700E", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "BDA71EE7-7CCC-432B-95ED-CA9BEF2445FE", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "1C138BA3-0E39-4F8D-AF9C-A91FF057C03F", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "6B05F646-4BDF-426B-98D2-C88CF71425B6", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "A961BDBD-BA4A-4DB1-A012-07198DFE9D35", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "8F7DAD30-0411-4DF0-AA1A-88381651BF59", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "1D4284A2-F010-4718-A2DD-7C7224268C95", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_group_user", - "defName": "组织用户", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "CCA5C0C5-F27D-4E8F-82C1-982B4C1FE6F5", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "user_id", - "defName": "用户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "6BEFB17A-C20B-4173-8A86-AAAE8C72C4ED", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "user_code", - "defName": "用户编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "6237F734-9F43-48A0-835A-F8DAC4A00F98", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "group_id", - "defName": "分组ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "9DC87F92-5D7D-4CB6-8758-1D1CD8451CF9", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "group_code", - "defName": "分组编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "228825B4-CDF6-4535-99B3-E5134EC83ED3", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "sort", - "defName": "显示顺序", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "65303E6C-8BE0-44F9-8184-689D9AE6D345", - "refDict": null, - "extProps": {}, - "id": "3BC2D18C-7461-477B-B6F5-A6A3B90F1C07", - "baseType": "6C3C997C-D2EB-435C-8B83-08A14EB3BD1A", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "E7EA28CA-FBD6-4E0D-92B8-AC9CC0BADF00", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "261F36D2-DD17-4027-B6C1-2E69864EFD70", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "AF0686F2-718E-4741-A96A-A0E509D846F0", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "4AB5C087-3CB2-4437-B56F-6BB70F748F57", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "D3FC773B-F7C6-4E95-9DAD-E9CC7B914ABC", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "700452FA-6BB2-4B61-A70D-105809C2D72B", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "A4AF5104-23B4-45EB-8781-E93D6937FDBA", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "C861BC1A-D58C-460A-8E0E-B72EAF03FA1D", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "DF5FA7DA-B747-478C-84DA-776CE6C4AA5B", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "22796924-B341-4B94-93A1-2123FCA89F40", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_user_post", - "defName": "用户岗位", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "F4C6AA00-6A2D-4117-8299-59701ADB67A5", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "user_id", - "defName": "用户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "063CF308-5BFB-407A-B985-517FC346C415", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "user_code", - "defName": "用户编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "486D5852-B6A7-4A73-94A5-DDD04805A4A6", - "uiHint": null - }, - { - "defKey": "position_id", - "defName": "职位ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "89EDB47D-F631-4219-BDF4-6DDDD313ABA7", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "position_code", - "defName": "职位编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "4236EEEF-DD5C-473C-981D-9B975C5238F7", - "uiHint": null - }, - { - "defKey": "rank_id", - "defName": "职级ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "1C481536-F359-4259-BB9C-B6DD6B34ECE4", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "rank_code", - "defName": "职级编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "96DEA5EB-737F-4549-AC97-20E89B9BC8E7", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "CA532BB6-B468-4DF1-BAF6-6FD6A216FC78", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "874D3D65-535A-472C-932F-7C13DB2EC688", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "13A0090B-6B99-4F2B-838E-9C2B5F8A848C", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "D2F41B0D-A729-48AA-A0A1-57917550D679", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "A3CBB1D9-FF16-4C3C-B7E4-583408A6835B", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "AE8A92DD-DDF7-4D08-B2E1-DD197FA61074", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "5D3EF72B-BC82-4189-907C-C1470A6324D8", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "112E9099-5F20-4869-BD9B-FF59534F1C8D", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "CB159622-4AFE-4704-B95C-5B92E50E9620", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "747C4415-1A06-4C1C-BB94-89D2075E367B", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_dept_user", - "defName": "部门用户", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "78BB5291-F31F-4157-98CF-DA1FA15D1203", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "dept_id", - "defName": "部门ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "AD98BD85-0B48-4897-B918-62B51EC0EF82", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "dept_code", - "defName": "部门编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "0D759E74-7E21-4B8C-BF69-E18A261C6B38", - "uiHint": null - }, - { - "defKey": "user_id", - "defName": "用户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "2C1F8096-F5EC-4FF2-AFD6-DE9A04E2D7FB", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "user_code", - "defName": "用户编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "FCAAE5D0-F2F4-4906-930A-6A4E30D2D31C", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "D4D92DA4-CB13-4F21-A6DC-4061A21055BF", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "98A0432D-F5C7-451A-981C-B50FE0DBCC6F", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "E346AEC1-0C41-401E-A155-8966E545C7B5", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "700ED850-AB9A-4705-863B-DDE6562F42FA", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "4F9BF62D-3EB4-4AA6-8AA8-6978FE16E327", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "CF8D39CB-F5DB-4619-BE45-4F87132C926E", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "2B0E0D2C-C9C3-40A5-B7EF-61C22DDBAA8C", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "BB7D8FFB-E49A-4471-A9CF-5356FE750F97", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "2D41931C-42A4-49B2-95DB-02279FED61B5", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - } - }, - { - "id": "AEFA4B13-9C1B-49AC-AA08-42098FDA0C1F", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_company_dept", - "defName": "公司部门", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "77FFDA07-8800-469F-8291-F49B91345826", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_id", - "defName": "公司ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "84EA8776-FAA0-4A2E-81FA-BEBDF3A25BD5", - "uiHint": null - }, - { - "defKey": "company_code", - "defName": "公司编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "A4EB2F63-0D15-48BB-B1E1-30AE51920040", - "uiHint": null - }, - { - "defKey": "dept_id", - "defName": "部门ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "684544A7-6E6A-4FBE-A598-60D04C218D5E", - "uiHint": null - }, - { - "defKey": "dept_code", - "defName": "部门编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "178BD105-7708-484C-94DC-8B89486E461A", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "2EEF0A01-C87A-41C3-A7B3-AECD2936503A", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "BA3A5B62-1C77-4E00-8C04-77D1C71298E2", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "25CC0659-328E-4870-872B-B4001C1F7EE2", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "C33B0069-A719-495F-82BB-FE767109FBE8", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "CD97DBC4-2835-44B9-BAFF-01A7D1139AC0", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "F402733A-2315-430F-BE19-6E7AFA9728AD", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "35639AAA-F440-4A4F-8E85-8DB4FCA1CE77", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "C2D0DD37-74A5-4864-983E-5A9C3A317FE2", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "324E5365-FB70-4189-910E-022576D44EF6", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - }, - { - "id": "775B18E0-24B0-408A-8811-34C4DCFB9BCD", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_app", - "defName": "应用管理", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "6E732BDE-2AEC-40A1-8C4D-2072FA6A6B75", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "app_code", - "defName": "应用编码（对内唯一标识）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "F943F1D5-656D-4CB4-986D-DFBC0E460C69", - "uiHint": null - }, - { - "defKey": "app_key", - "defName": "应用key（对外唯一标识）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "C58EDBCA-5EE3-4137-95F0-61628E3D9744", - "uiHint": null - }, - { - "defKey": "app_secret", - "defName": "应用密钥", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "BEA88D44-3F6A-41AE-822E-EFD0C0587373", - "uiHint": null - }, - { - "defKey": "app_name", - "defName": "应用名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "FFE9259E-E392-4ABE-B1BE-A7E5D40F34A4", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "app_name_en", - "defName": "应用英文名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "9DA33ACD-3FBF-4921-AF26-20396C8FF1C7", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "app_remark", - "defName": "应用描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "0BE0632E-1B1C-4AE7-8A89-48C1B862E81D", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "app_remark_en", - "defName": "应用英文描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "C2F7105D-992C-4D9F-9B20-87599DA55F20", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "app_icon", - "defName": "应用图标（如：icon-zuopin）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "18D31C9C-AA43-4A84-AABA-6DDBFF6A85A9" - }, - { - "defKey": "app_icon_color", - "defName": "应用图标颜色（如：#13C2C2）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "52506786-DF3D-4034-9301-F2D6028EE59D" - }, - { - "defKey": "app_icp", - "defName": "应用备案号", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "094BF48B-2722-40E2-97AE-36C9EC646DD3", - "uiHint": null - }, - { - "defKey": "is_common", - "defName": "是否公共应用（0否 1是）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "131A2B29-764E-4085-AB9F-BCA758C65364" - }, - { - "defKey": "is_mobile", - "defName": "是否移动端应用（0否 1是）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "D0B3F59A-8567-49B6-B88A-4A93C6EF7C83" - }, - { - "defKey": "request_limit", - "defName": "每秒间隔访问次数限制", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811", - "extProps": {}, - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "id": "5E25AE77-EACC-413F-B520-330333197263", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "855C4C20-98D9-40FB-9C20-1DD6590C2F7D", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "E2BD3267-6C49-4320-8831-24DB272CA67B", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "89B5E716-5A58-4DA4-A873-BB01FE581EE6" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "26FDAA5F-52A6-4E52-AC78-9741AA97E59F", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "35F85A5D-9977-4AAD-AED7-26D058F42F4D", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "3B26AB46-AEB0-49E3-A254-88CFC7595377", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "238949E4-BFFF-413E-92C2-39778BB70E30", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "14ADA876-28FC-44C3-92A4-C034999C96B2", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "EE821892-902C-409A-AB29-03BB1A8103F6", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - }, - { - "id": "C3673587-7A3B-422B-90F7-6903E613887A", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_app_publish", - "defName": "应用发布", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "E70A7171-5C72-4B92-B9EF-C88F1444504B", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "app_id", - "defName": "应用ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "44B37017-23A7-4215-AAB6-927AFB6F4A86", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "app_code", - "defName": "应用编码（对内唯一标识）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "9807DB62-9F94-4FA1-8681-676A1B9092CF", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "app_key", - "defName": "应用key（对外唯一标识）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "960F25A2-6C27-4E38-806B-6D269A5E5314", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "app_version", - "defName": "应用的版本", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "E890A491-F836-422D-9D05-8469B22FA5F0", - "uiHint": null - }, - { - "defKey": "sdt_version", - "defName": "适用的启迪平台版本", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "6CABF369-DAEB-4BD1-B666-5C2AFAAC611D", - "uiHint": null - }, - { - "defKey": "file_name", - "defName": "文件名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "9C3B5F11-27D2-4017-94F1-44150674ADA8", - "uiHint": null - }, - { - "defKey": "file_url", - "defName": "文件地址 , 默认相对路径", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "CD8BEA57-947E-4BE7-B4FC-7482474F84E4", - "uiHint": null - }, - { - "defKey": "file_size", - "defName": "应用大小 , 单位字节", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811", - "extProps": {}, - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "id": "235F8353-8FA4-4619-B286-00ADA280BF86", - "uiHint": null - }, - { - "defKey": "audit_user", - "defName": "审核人", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "id": "F556D30D-61A8-4CE5-A496-0EE020083317", - "uiHint": null - }, - { - "defKey": "aduit_time", - "defName": "审核时间", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7", - "extProps": {}, - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "id": "EED572B4-55A0-4B8B-B7F9-745A24EC35BB", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "14141B34-8C58-4508-8CE7-929D1111ABDE", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "541052AA-641E-44C9-A699-FEACAE1A0E3C", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "6D1EA699-E105-4465-9202-71C2647C7354", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "580E87DB-B655-4094-8C5C-E46097A181F9", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "3C3EAA8A-854C-439F-854E-1FA9272624A0", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "518ED06E-4947-460D-8485-E046175070C8", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "BB38AB5C-EA26-4F4F-925A-584797311624", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "14DA324D-C190-4452-8B69-5C66319E851D", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "90DB25C0-4BD6-40E6-88A0-B91C2C95D701", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - }, - { - "id": "DB2B6124-567F-4BB0-9C74-7359D504E70E", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_menu", - "defName": "菜单管理", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "37A7ECF8-763E-4267-9670-94E7CCDD6C0C", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "parent_id", - "defName": "父菜单ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "510772B8-ED63-416B-891E-F2015D799D46", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "menu_code", - "defName": "菜单编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "7448D389-0538-479F-AD9D-943E6FB68B42", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "menu_name", - "defName": "菜单名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "56F86226-1A95-4E73-9F70-345175964FDD", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "menu_name_en", - "defName": "菜单英文名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "52A444E3-BAF4-4DDD-8F75-D3EA8DD2D0E7", - "uiHint": null - }, - { - "defKey": "menu_type", - "defName": "菜单类型（1目录 2菜单 3操作）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "7FCA70FD-7C0E-4A9D-97C6-1FEDFDA75C6D", - "id": "6DC01084-8B12-4A66-BF6F-70F95D53D0FC", - "baseType": "CE1004FF-CF1C-4DEB-B661-1B5D5474E0B8", - "uiHint": null - }, - { - "defKey": "menu_icon", - "defName": "菜单图标", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "8C4B98EB-27A8-43CB-B0F5-6558C2F77CFD", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "menu_remark", - "defName": "菜单描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "12DED8EE-4409-4802-BE3B-D00C2B2169F2", - "uiHint": null - }, - { - "defKey": "menu_path", - "defName": "路由地址", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "1AC4894E-1634-4636-9F1F-A1FD3D0C5F20", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "controller_path", - "defName": "接口地址", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "6EA86FDF-A737-494A-B61A-0923D6FA5E43", - "uiHint": null - }, - { - "defKey": "menu_component", - "defName": "组件路径", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "801E683B-6F3B-455C-B3B4-BA9F38B48BA1", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "menu_permission", - "defName": "权限标识（应用编码:菜单编码:接口地址）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "2FC70F1D-5AA8-47BC-BCD1-97EADFDA672E", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "menu_shortcut", - "defName": "是否创建快捷方式（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "8B69A390-7EDA-464D-AFB5-04CA8EA862C2", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "keep_alive", - "defName": "是否缓存（0实时 1缓存）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "77DC202F-CF0C-4DFD-B7AF-1D87F2B035E0", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "sort", - "defName": "显示顺序", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "65303E6C-8BE0-44F9-8184-689D9AE6D345", - "id": "D7117674-FB11-43DA-BE82-A68CCDB45E86", - "baseType": "6C3C997C-D2EB-435C-8B83-08A14EB3BD1A", - "uiHint": null - }, - { - "defKey": "visible", - "defName": "是否可见（0隐藏 1显示）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "6AEF16F6-AAD3-43E2-BAAB-5301EB0A28AD", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "BA067445-37C4-4940-9247-C4340BB7DEEB", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0可用 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "E43F8D0E-4F3A-4F46-A07F-2942D80BD301", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "D23BBCB7-4812-4CF6-AA41-4E0219E8C389", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "4776ED05-F971-4BB0-B16E-B4D87C38A8B2", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "049F0DC4-5E34-4B20-8D6B-A6B306E07B4D", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "14A1CB0A-A51B-4E25-B6B5-FF602CF7EF58", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "685361A8-DC06-4B6D-AD0F-1130E29D12A7", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "16A31C0E-AE72-4036-A217-F187F21007C6", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "72E86651-B73B-427A-9FDD-91A2170E2E11", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "FB9B8C90-DCBD-4EFF-AD8C-2D0EF80D8C1A", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_app_menu", - "defName": "应用菜单", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "092FFE91-45A6-4856-B8BA-27A20191CAB8", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "app_id", - "defName": "应用ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "B13ABEF0-F7A0-4DA1-B309-793E157E776F", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "app_code", - "defName": "应用编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "80605C79-F4DD-460A-ABDC-AEAC79839239", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "menu_id", - "defName": "菜单ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "ECAA5FA9-1515-48EB-83DF-A465A395F109", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "menu_code", - "defName": "菜单编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "5B15FBEA-2E5D-4C79-B563-517031FFD09A", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "FFF9A775-2867-4221-ABE7-6F9222DE5660", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "6CE9856F-F059-411D-BCBA-8004F6DB1E0C", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "DB2044AB-CAAA-4916-A7CD-CEFE08372589", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "3F62E6BC-916E-4C5A-B58A-CA82E1850EAE", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "51CB694B-C05F-4BCD-8EA9-8A18B7E06634", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "4E124D00-ACC1-4563-9205-D47FEA90B273", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "84221B4E-4F7D-4A33-9034-DB43EABA688D", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "C083B722-04C3-4008-8617-8194691BA372", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "A7E0D56F-FCD5-461B-AEDC-F37BB44DD3C6", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - }, - { - "id": "61D0DDB6-B739-4653-A03B-BFB253CFFE93", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_app_group", - "defName": "应用组织", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "F04B53BF-CF25-4685-AEEE-D3C384212EAB", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "app_id", - "defName": "应用ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "F4C25E3A-D512-4004-86CB-A698F607CAB1", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "app_code", - "defName": "应用编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "54DCA697-59B7-4A9A-8E11-1C9888D6BE76", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "group_id", - "defName": "组织ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": "", - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "E04F1DBD-89F0-45B2-ABD6-D998B7D8B5DC", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "group_code", - "defName": "组织编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": "", - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "001826CC-78C8-4C94-80BF-61FFD3BAB021", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C" - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "9B90D544-9A77-4504-B446-36A505592CEE", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "ECBCFEC1-9B76-451B-A9EB-CCD58E304C54", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "F32A160D-4D33-4B92-A73F-8FE3F1D52AA1", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "56BC7A0D-7157-4968-8949-7221B8FDFB51", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "146E5EF2-D7CA-4C2E-B214-62C4BC5683E1", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "9E4A9918-F990-4FC7-A1D3-B0B66193B827", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "542FEB8B-7F1D-4A92-A00A-1C55A85D963F", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "CDB1EB81-A447-4526-9A8D-6AB10C38C572", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "C6CDB5D9-8911-4C70-9B3D-4D3755EE69B6", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - }, - { - "id": "F4F0C3D5-2A29-466C-A787-D01DD13FCBE7", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_role_menu", - "defName": "角色菜单", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "33A798E1-957A-4467-AB8F-7A500FDA917E", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "role_id", - "defName": "角色ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "C8887765-A039-418D-AFEC-92522C0269AC", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "role_code", - "defName": "角色编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "DFE5818A-2FC8-44B9-9EF1-CA8C1F517737", - "uiHint": null - }, - { - "defKey": "menu_id", - "defName": "菜单ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "9881E189-37F4-415A-8BE0-1EBAA195CA16", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "menu_code", - "defName": "菜单编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "0F8545C8-7330-4F1B-A7E0-D1E075A8E90A", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "FC0CA026-57DF-48D2-AA36-8D93AEA2ED8E", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "5871908D-C004-4DB5-AD31-8E1D32F2B29B", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "37A9A59B-BC58-4322-9736-E58296081F52", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "560087D5-EA09-4DAD-A43E-B09CCA7347BF", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "B60ED991-3B50-499D-BD9D-3AE08C8529E2", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "482B614B-ACCF-4B6B-890A-E437B2990B7D", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "142E3B69-EAE3-465D-97D1-D62F3432A132", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "61D22B68-0F5A-4198-A8CA-176A262EF982", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "59F610AF-3428-4322-842A-43B05E2BBC25", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "86660DB3-B3CA-4066-A317-BD6136C204EA", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_role", - "defName": "角色管理", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "7F9EC828-8962-4923-95C6-009CEE1C7E6D", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "role_code", - "defName": "角色代码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "4ED36842-98D4-418A-9CEB-8871719844EA", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "role_type", - "defName": "角色类型（1:部门角色 2:岗位角色 3:用户角色 4:组织角色）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "7FCA70FD-7C0E-4A9D-97C6-1FEDFDA75C6D", - "id": "79345A4C-D039-446F-92B0-F8DB7F4F4CC4", - "baseType": "CE1004FF-CF1C-4DEB-B661-1B5D5474E0B8", - "uiHint": null - }, - { - "defKey": "role_name", - "defName": "角色名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "3B9330C2-B582-4FB7-8FD7-09AFFB0563D8", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "role_name_en", - "defName": "角色英文名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "8ED35E54-31A8-4B3C-8976-A6E5E58D18E0", - "uiHint": null - }, - { - "defKey": "role_remark", - "defName": "角色描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "419FE9C2-97E3-4EAA-8356-1F3B06202932", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "role_remark_en", - "defName": "角色英文描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "880E65B3-F5DA-4DAD-8058-7811EC124DD7", - "uiHint": null - }, - { - "defKey": "role_scope", - "defName": "数据范围（1:全部数据权限 2:自定数据权限 3:本部门数据权限 4:本部门及以下数据权限）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "7FCA70FD-7C0E-4A9D-97C6-1FEDFDA75C6D", - "id": "059B1DCF-45B1-4338-A3A8-C3C40E0292BA", - "baseType": "CE1004FF-CF1C-4DEB-B661-1B5D5474E0B8", - "uiHint": null - }, - { - "defKey": "sort", - "defName": "显示顺序", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "65303E6C-8BE0-44F9-8184-689D9AE6D345", - "id": "49A186A1-B876-44D5-942E-58A3654AD7F3", - "baseType": "6C3C997C-D2EB-435C-8B83-08A14EB3BD1A", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "276609F1-FD95-4DFA-95F5-3A23AC71E76F", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "9F4A1C1A-3EF4-4C8B-9AB5-80567BCF0A3D", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "EC7FD143-1B60-407F-8E3B-94341A295DAD", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "A62AF76C-A80B-4412-90FC-B11BCFE18740", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "5177C3C1-50B8-4DF1-B61F-62B543C12990", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "E2C5BDA5-8F76-41F9-B93D-9C16B3F5ED00", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "4024ECC6-A527-4430-90CD-3651EC452F59", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "4C0F7315-66F6-49B8-B024-8C2EE92A4377", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "63F54C8D-4576-48F7-AA36-31D2B3D63411", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "56D3BA96-F1BF-41DE-B05C-9C14EDF17881", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_cord_role", - "defName": "部门角色", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "76084829-5E7E-4668-A5AE-CAD458D9D5A3", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "cord_id", - "defName": "组织ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "455D8461-1911-4E0B-881C-92D3FB416352", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "cord_code", - "defName": "组织编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "A228CBED-0FA5-49F1-8D87-8EB8227B022F", - "uiHint": null - }, - { - "defKey": "cord_type", - "defName": "组织类型（1:公司 2:部门）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "CE1004FF-CF1C-4DEB-B661-1B5D5474E0B8", - "extProps": {}, - "domain": "7FCA70FD-7C0E-4A9D-97C6-1FEDFDA75C6D", - "id": "FE80B2F1-8C98-4925-B82A-E62A1D5BEC31", - "uiHint": null - }, - { - "defKey": "role_id", - "defName": "角色ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "3C7049D9-D2E4-4819-9CAE-DD0806B18C2F", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "role_code", - "defName": "角色编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "27D60758-9060-4057-AE92-1B4E0515E771", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "2C3223F4-5C96-4CA5-ADF3-304BB3BB87A0", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "2E109B64-83BC-4115-BBFF-35D884CAB5C6", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "2868C97A-F344-4235-94EC-A32137C13E1E", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "B717A53E-17BC-4288-85D3-6B14CE7E2BC5", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "CC1B1F4A-AFB3-4FE1-8E93-01EBF1E63188", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "63F229B2-A90E-48FA-A028-2B6F3120D2EB", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "4CF750FF-E5BA-4649-BB11-080F71D62C06", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "3C5FE2EA-E703-4BAA-8BD0-05CBDA0375BA", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "0DABB971-7461-4483-885A-3884EF627A98", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "C57C4006-7B7B-45F6-B10C-BDA5B0AAC2F1", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_post_role", - "defName": "岗位角色", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "D8CA3CC3-FC71-465B-9E81-2BC37CC8B999", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "post_id", - "defName": "职位ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "02D7FA9A-CC76-4D0B-8ABC-769D1467C369", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "post_code", - "defName": "职位编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "68D8A782-296A-43B9-9798-2E2EB71EE019", - "uiHint": null - }, - { - "defKey": "role_id", - "defName": "角色ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "D076B3B7-E615-48AA-9B10-D61F8CDC44DF", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "role_code", - "defName": "角色编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "E65C808D-6D46-4409-8710-FFB9D5E3ED9D", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "9A015865-2EF8-4906-8260-3BC9C1CD1798", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "8B4D7C8F-C8DE-486E-88D0-8E969CBCE0AD", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "50F2CD69-A94F-465B-BC57-1E38EFCA2930", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "B2996F3C-0830-44E6-9011-A4442BED05A4", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "CAAC0AF7-6042-4ADE-AB1E-C7AA527ACF77", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "48C83C16-85A7-4822-BC93-BE539596140A", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "698A269D-D450-4241-9E00-67FC3B6EE7F7", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "4BAF8C6E-C166-4C99-A704-B45A9DC3CEF3", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "DF73248E-C8AA-4B01-B79D-8BA7A65396F3", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "C7533EC5-6E4F-43B8-9F11-09640372F7E5", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_user_role", - "defName": "用户角色", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "1E2A9475-2F0E-4AEC-A990-12C55F3C33C0", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "user_id", - "defName": "用户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "A1DDA7D9-5C4F-49F3-BE4D-8295E5CEAA37", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "user_code", - "defName": "用户编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "B581A9DB-D8CD-49EE-A117-F6F65CC8751D", - "uiHint": null - }, - { - "defKey": "role_id", - "defName": "角色ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "01FF490D-8EC1-4EA5-B708-E6214702B513", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "role_code", - "defName": "角色编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "1137ED37-CC99-499E-A17C-B23D4F7ECDA4", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "BEE86195-ECFA-4B9B-AD2F-5520F9942778", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "FE4BF5AC-FF28-4054-BC24-D2B13207810D", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "C5D54A41-E36F-4DDA-980A-ABC183F3F03A", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "8A34F4BB-2F22-458B-B948-4A4EFF2F52B5", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "D090528F-CE1E-444D-9E2F-DF4804881D6F", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "8230F75B-0193-47B4-9CDE-4CF6D567F0FF", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "FE602670-2571-4DCA-955F-31FF8697F13B", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "4896FED5-4B55-4030-9131-7B40FAB3DF21", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "5FD0DEBB-42A5-4B7A-BBE9-ED63E10FD1AA", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "D3ACD8DD-4114-4773-B785-BD3AF7A4FF16", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_group_role", - "defName": "组织角色", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "C794C158-B308-4B1D-8A7B-948FF60E8207", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "group_id", - "defName": "用户组ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "96112A96-16A6-41E2-AB80-B4C3C42ACDB5", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "group_code", - "defName": "用户组编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "E1C4381E-CAAB-4052-8AE4-B4865332AE06", - "uiHint": null - }, - { - "defKey": "role_id", - "defName": "角色ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "A96B5D8A-5105-4256-8F29-1974A42827C7", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "role_code", - "defName": "角色编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "E39468CF-30F0-4712-A22C-869EA24F2DD2", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "5B6515DB-9ABE-4C68-BE7C-0B98D54275F4", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "BCCE91CF-E958-42B9-AEE2-A2CBBA650038", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "A2AD6D62-DAF1-4C17-99E3-F190410263CB", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "F497388C-688A-4E76-8003-130DF807DDBD", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "1C25F568-D8A6-4F49-8B06-DB8674D82F16", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "B4D14681-CA80-45B7-B67C-EFDE956AD2A9", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "6F2F3E5D-A57F-49E0-ADA0-4ED0A010BC91", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "767C0E90-951A-45DB-B28F-4C08D92BCA38", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "5AA5823F-BEE0-4A95-ACA8-7842A72BB843", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "17BA66C8-FE0A-48F0-B17C-C548644DB807", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_role_apply", - "defName": "权限申请", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "AB6C8597-E3AF-4243-A42F-E2C981147126", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "app_id", - "defName": "应用ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "28DF41B7-87C5-48E4-8A10-ED4F3D815235", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "app_code", - "defName": "应用编码（对内唯一标识）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "FA0DA039-6AA7-4C83-973A-650531D3EA17", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "app_type", - "defName": "应用类型（1APP 2API 3其他）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "CE1004FF-CF1C-4DEB-B661-1B5D5474E0B8", - "extProps": {}, - "domain": "7FCA70FD-7C0E-4A9D-97C6-1FEDFDA75C6D", - "id": "E33D64FC-45A6-491E-8F11-72C215AD5302", - "uiHint": null - }, - { - "defKey": "menu_type", - "defName": "菜单类型（1目录 2菜单 3操作）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "CE1004FF-CF1C-4DEB-B661-1B5D5474E0B8", - "extProps": {}, - "domain": "7FCA70FD-7C0E-4A9D-97C6-1FEDFDA75C6D", - "id": "ED7852E5-1616-473B-B559-B40D06F40ACD", - "uiHint": null - }, - { - "defKey": "apply_type", - "defName": "权限类型（）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "CE1004FF-CF1C-4DEB-B661-1B5D5474E0B8", - "extProps": {}, - "domain": "7FCA70FD-7C0E-4A9D-97C6-1FEDFDA75C6D", - "id": "E1B2CFF6-586C-42C1-9761-7FD8A05AEA84", - "uiHint": null - }, - { - "defKey": "apply_value", - "defName": "", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "B17BDED3-085F-40E1-9019-3B79CF2BF075", - "extProps": {}, - "domain": "3E948CEC-3070-472C-AF92-F3CA11EC9D15", - "id": "87021D94-CDB9-43E9-9C15-3E894FFF8763", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "8D412D62-6555-40DD-B8F2-7F97A8C6BCD8", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "BA802F15-8AFF-4C7E-87FD-8EF2A7D5791F", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "B32B5590-A95C-4422-8450-76866E2C9AE6", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "E5FB627F-F0FD-4803-BEB2-F88575B3FBA8", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "3D5CB6CF-15AB-4E67-9FAE-3FA44C3578D3", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "18C6C8DA-8B36-4848-A24C-9FA96FB7C459", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "136D9855-7B01-429A-AB94-805EFB7DC55E", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "7E9460F1-4EA4-46B7-9B82-73B28924E8F8", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "30201258-A45C-4D6B-97A2-A63EE9C3FF1E", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - }, - { - "id": "8B55E82F-21E9-472E-98FE-CD3A305B1970", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_area", - "defName": "区域管理", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "F8D3E2AB-2572-4090-B993-B2BA9A19C8FD", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "parent_id", - "defName": "父区域ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "9ADAA598-2AAD-4050-9762-947C5E1F7121", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "parent_code", - "defName": "父区域编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "7C505CED-8CC9-421E-879E-B09D8F6FD587", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "area_code", - "defName": "区域编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "9D15C172-0A01-4662-A9C7-9D51A0297963", - "uiHint": null - }, - { - "defKey": "area_name", - "defName": "区域名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "A25BC6FC-4146-4402-BE90-5D18E37E7B7A", - "uiHint": null - }, - { - "defKey": "area_name_en", - "defName": "区域英文名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "CB2AE016-45F6-41BD-9BCB-AA380F7F3479", - "uiHint": null - }, - { - "defKey": "area_remark", - "defName": "区域备注", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "81498BAC-B6EF-4C04-BEF4-C3272562E468", - "uiHint": null - }, - { - "defKey": "area_remark_en", - "defName": "区域英文备注", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "80FCC74D-98C5-4F39-AEE6-B5B1BEF41AB4", - "uiHint": null - }, - { - "defKey": "postal_code", - "defName": "邮政编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "2900FD56-FC63-416A-A7D8-181BEC6DA2BC", - "uiHint": null - }, - { - "defKey": "area_level", - "defName": "区域级别（1-5,省市县镇村）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "CE1004FF-CF1C-4DEB-B661-1B5D5474E0B8", - "extProps": {}, - "domain": "7FCA70FD-7C0E-4A9D-97C6-1FEDFDA75C6D", - "id": "9882A74F-C788-4222-BE73-8C27DEE6C869", - "uiHint": null - }, - { - "defKey": "sort", - "defName": "显示顺序", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "65303E6C-8BE0-44F9-8184-689D9AE6D345", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "86E060CB-6C86-46C9-8E1D-219B54587A7B", - "baseType": "6C3C997C-D2EB-435C-8B83-08A14EB3BD1A", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "F3B7D66F-3E99-4545-9B8A-1F820B076B4D", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "8B7335DA-E904-407A-9651-408316C42E78", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "94A1E9EE-080F-426C-A6B3-0C4E78D0E1BE" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "5C91294A-159E-496A-933E-362F311D6A53", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "354C85EF-718E-4898-901D-4419E19EBB4F", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "945CCD52-7F41-449A-B5F7-A298593827FD", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "4919B606-6CD9-41C3-BE30-761D219B3F90", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "ABE9D024-E62B-480B-8AAF-98CE4AE9680D", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "D5AB45E2-EB36-4B02-9A13-DE1B12F8189D", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - }, - { - "id": "DB07619A-BB44-4D25-8243-6D652E9091AD", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_bucket", - "defName": "存储桶管理", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "6DD2A579-C8D2-44B2-AA68-66B7853F5CD2", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "bucket_code", - "defName": "存储桶编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": "", - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "40DC9A67-469E-4CA5-9B31-0CF586C50CED", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C" - }, - { - "defKey": "bucket_name", - "defName": "存储桶名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "refDict": "", - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "C16100CF-C99A-4F06-B597-555D75E18820", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "bucket_tags", - "defName": "存储桶标签", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "refDict": "", - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "58DD92C2-1A16-4D3A-9091-EFE877E607C0", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "bucket_region", - "defName": "存储桶所属区域", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "DE84B9D8-F64B-4533-8337-E25A3DE131E7" - }, - { - "defKey": "use_space", - "defName": "使用空间", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "F59DC308-1C50-49B6-AEA0-497791759010" - }, - { - "defKey": "hard_quota", - "defName": "配额空间", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "4ADA032A-5341-4CCB-A8DA-6C4544C73E8A" - }, - { - "defKey": "access_policy", - "defName": "访问权限（1私有 2公开 3自定义）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "CE1004FF-CF1C-4DEB-B661-1B5D5474E0B8", - "extProps": {}, - "domain": "7FCA70FD-7C0E-4A9D-97C6-1FEDFDA75C6D", - "id": "0F895B19-F565-49A3-B993-6E61F202F4E6" - }, - { - "defKey": "encryption", - "defName": "是否加密（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "ECDB0B16-1B4D-4E20-96A4-EF3FC638DFB5" - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "536CAAD4-5001-467B-85B6-32F4A444A0F4", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E" - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "AF7A0C1F-5EAF-4C51-A8FE-83EE647E13B9", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E" - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": "", - "uiHint": "", - "id": "06C10DB6-68FA-47BB-B715-36F369C7C7EF", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "B9BD5279-94EF-41EC-A0FC-22B7161D7DA7", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": 32, - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": "", - "uiHint": "", - "id": "8387B3A8-207D-46E1-B7D5-F61F3BFF8AC3", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": "", - "uiHint": "", - "id": "6DD34871-65C6-45ED-B283-BD7C2E85AC03", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": "", - "uiHint": "", - "id": "13C301DE-E05B-478F-9AF7-983A1A132082", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": "", - "uiHint": "", - "id": "B155E4BA-FA22-481C-8775-5F91B9AF1723", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": "", - "uiHint": "", - "id": "065A9E88-EA0B-4924-B10A-3C10DDF21912", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - }, - { - "id": "29D690AF-1F60-4B9A-8538-9BE0FCAD4E65", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_file", - "defName": "文件管理", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "9FF741B5-2B19-4D2E-9663-0B486EA96E98", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "bucket_code", - "defName": "存储桶编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "CE109AFD-FF6C-461E-9001-F5D3290EB0B1" - }, - { - "defKey": "bucket_name", - "defName": "存储桶名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "7F9BEDDF-F507-4812-9CF3-98B55AA4A295" - }, - { - "defKey": "file_code", - "defName": "文件编号", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "9C6DCE18-4191-4B4E-9B8C-CA545ABC9436" - }, - { - "defKey": "file_type", - "defName": "文件类型", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "C33F47CA-25F7-42B6-8E56-4C3E06129CA5" - }, - { - "defKey": "file_size", - "defName": "文件大小", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "EA67F773-0552-49BB-93C4-26452EB07D21" - }, - { - "defKey": "file_tags", - "defName": "文件标签", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "6B6DDA13-C10E-48EB-97CD-B3944970A258" - }, - { - "defKey": "file_name", - "defName": "文件名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "F4905329-F240-4733-968D-13DE09E5DAC7" - }, - { - "defKey": "file_path", - "defName": "文件目录", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "E67F3836-D666-4783-855F-4671CA39A39D" - }, - { - "defKey": "original", - "defName": "原文件名", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "17A9CA36-33E7-4DE8-9BED-849E55895423" - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "5BA1FDF1-0CA4-40B5-ADB5-E73D7FBDB9FC", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E" - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "B82EF3EB-7767-4ED4-9F77-0AF61B2F2537", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E" - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": "", - "uiHint": "", - "id": "7A6E9398-7893-4D8B-B632-B260E3924E0E", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "CE4B80BA-F8E8-42FF-BC54-4A3EB35F1273", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": 32, - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": "", - "uiHint": "", - "id": "47F69825-7EB1-40B0-AEE4-B9F2A32AD545", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": "", - "uiHint": "", - "id": "5937BF38-332A-4996-A671-56011228631D", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": "", - "uiHint": "", - "id": "F1278709-6357-4EC6-8955-911E44B6399A", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": "", - "uiHint": "", - "id": "ACA72904-3905-410E-B287-55E0DF871246", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": "", - "uiHint": "", - "id": "38E72BB9-7CED-4421-8981-BC325722B502", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - }, - { - "id": "80DD91E5-23EA-4325-9CBA-14CD7DF1EC14", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_dict", - "defName": "字典管理", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "CCA10266-8B82-4E1C-BA6E-3500E06364A3", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "dict_code", - "defName": "字典编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "FD965578-9558-44A9-B1B6-AC7335A61AF2", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "dict_name", - "defName": "字典名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "20589362-5613-43F9-9C17-B1367078B6C2", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "dict_name_en", - "defName": "字典英文名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "B388B184-7C51-49B5-A899-58F6BFF9A2B3", - "uiHint": null - }, - { - "defKey": "dict_remark", - "defName": "字典描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "id": "2700BE0D-296E-4FE0-9B48-6A29D16471DD", - "uiHint": null - }, - { - "defKey": "dict_remark_en", - "defName": "字典英文描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "id": "BCF80390-5CE4-4EDF-92A5-C3508B78E661", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "045AFED0-6CFA-4FA9-9FD5-E75B6CE46DA7", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "B0EDD0F8-FEC2-42AE-ABD5-1D2C37C6F7EB", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "21D75156-5D71-4BFB-B7A5-5C6F0A36B934" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "E72DE722-ACF2-432E-845D-6711771EDC14", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "7DE3821D-2D0A-4066-BABB-0E32AE7B7E3D", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "8CAEBF99-21DB-4B0E-95D3-2B35843BDB2C", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "903E86F7-DDD6-4542-8F43-9036AAA667B8", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "D256A74C-4218-4549-AE35-FA1C46716F14", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "BDE2E022-2BE3-4AE0-9782-D3AD350D14F3", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "FA177406-0D1A-4F78-8C06-88A4D851D748", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_dict_item", - "defName": "字典项值", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "783EBEEA-4775-4614-B623-FFED7E85F39E", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "dict_id", - "defName": "字典ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "8CBBA847-AB5D-4793-9E03-705AC77289B8", - "uiHint": null - }, - { - "defKey": "dict_code", - "defName": "字典编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "284222A2-F6D1-46D4-8D5B-CC85A0A8268E", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "item_value", - "defName": "字典项值", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "16882DB3-07B6-42E1-AE98-69DEF8B5887A", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "item_text", - "defName": "字典项文本", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "6E44161A-4F00-43D0-B28A-EB2321DA8E44", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "item_text_en", - "defName": "字典项英文文本", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "D88032CF-2326-4E18-A3AC-A5871E1AEE4A", - "uiHint": null - }, - { - "defKey": "item_remark", - "defName": "字典项描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "D6C59A0F-8576-417D-9D66-314720A1986B", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "item_remark_en", - "defName": "字典项英文描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "AEC2BF44-156B-4AAA-8838-4577A008F41F", - "uiHint": null - }, - { - "defKey": "is_default", - "defName": "是否默认（0否 1是）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "5073E5E0-3423-4D73-A3A3-69DF8B251BD3", - "uiHint": null - }, - { - "defKey": "item_style", - "defName": "字典项样式", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "70605CEE-CCAA-4EB2-B7FD-26F72015AADD", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "uiHint": null - }, - { - "defKey": "item_css", - "defName": "字典项CSS", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "3E948CEC-3070-472C-AF92-F3CA11EC9D15", - "id": "9C2AD93F-385B-4B36-8A02-E579BFB70470", - "baseType": "B17BDED3-085F-40E1-9019-3B79CF2BF075", - "uiHint": null - }, - { - "defKey": "sort", - "defName": "字典项排序", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "65303E6C-8BE0-44F9-8184-689D9AE6D345", - "id": "7D1622D7-2672-4EAE-A9C9-4E131A6D2073", - "baseType": "6C3C997C-D2EB-435C-8B83-08A14EB3BD1A", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "389AAB25-A5C3-4076-94BB-621B27F14ACA", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "99774B8D-FC7A-4A7A-BA63-9E35365B0488", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "8A594F43-5504-44C8-AF5E-B7123E23FE04" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "B7F61AF4-8B04-45B0-95CE-251832FF8820", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "extProps": {}, - "notes": {}, - "id": "BA2AA268-E3F1-4F38-9BBD-0E2AB32DEFF5", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "0E245BFF-6555-4CA8-A656-B44C68ECAE7C", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "4A2B1E04-94C4-4AE8-BBFF-A8BE2D36DDD3", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "A0258BD2-DC6C-43B2-9350-20896623B9B5", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "9898AF22-8778-456E-A976-764F6BB152CA", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7" - } - ], - "correlations": [], - "indexes": [], - "type": "P", - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {} - }, - { - "id": "06CFE757-DE3F-4A68-8C86-E1FD232A9B2C", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_restrict_ip", - "defName": "黑白名单", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "17055510-EACA-4DD5-A3D0-374C912BDAA0", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "app_id", - "defName": "应用ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "62D9146B-42E7-4A7B-8365-62DB4191D002", - "uiHint": null - }, - { - "defKey": "app_code", - "defName": "应用编码（对内唯一标识）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "0CCE61A4-1912-4AF2-8787-524863590C52", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "white_ip", - "defName": "白名单IP", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "830A4A9E-9A71-4E38-A380-77098C8DB9E0", - "uiHint": null - }, - { - "defKey": "black_ip", - "defName": "黑名单IP", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "EF189F14-01AC-441C-A7DF-1F0EFCF9A70A", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "B1706516-641B-4F68-9917-6821595D716F", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "5C01572A-0EB9-42D7-B9FE-6E2DC0AFA37C", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "8A9FFBC8-CA88-49B9-B02A-E9D881F9A1B5" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "E4480E20-5E35-41B8-80B8-FC99763684F5", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "76BCE955-2F88-4D96-8298-11D90ADFD176", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "09E6127D-EC44-46A0-B249-4D75D13F8079", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "8184413E-C7A6-4218-B909-FD98B7589F2F", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "E3242CE5-D31F-4806-9987-09254004D9B8", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "2F6037B3-F56E-45C1-9FB2-3802AA9D4EAE", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - }, - { - "id": "9A6E984E-1CC5-4BDB-B553-9CAB0DC3D4E4", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_log_record", - "defName": "行为审计", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "52FD6D1E-BAD9-4B1C-B60D-335C61E51DBB", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "app_id", - "defName": "应用ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "102BF764-1B7D-4767-9BC2-3BDC76465836", - "uiHint": null - }, - { - "defKey": "app_code", - "defName": "应用编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "B68E20F9-D765-4466-85DA-13E309A95F10", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "uiHint": null - }, - { - "defKey": "content", - "defName": "操作方法名称或描述", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "AC0A57EF-A54E-4CD3-940E-728D643A3417", - "uiHint": null - }, - { - "defKey": "operator_type", - "defName": "操作人类别（00其他 01管理端用户 02移动端用户）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "CE1004FF-CF1C-4DEB-B661-1B5D5474E0B8", - "extProps": {}, - "domain": "7FCA70FD-7C0E-4A9D-97C6-1FEDFDA75C6D", - "id": "DA6840D1-CCB8-4A35-9AFD-E8EFABD7AAFA", - "uiHint": null - }, - { - "defKey": "business_type", - "defName": "业务操作类型（1新增 2修改 3删除 4导入 5导出 6下载 7上传 8授权 9登录 10登出 11强退 12修改状态 13生成代码 14清空数据 15更新缓存 99其他）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "53DDB017-9100-4712-BF22-A7E73CA6310C", - "uiHint": null - }, - { - "defKey": "business_no", - "defName": "业务流水号", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "40BF4650-C1DC-4408-99F2-7281AEC79EF6", - "uiHint": null - }, - { - "defKey": "trace_id", - "defName": "链路追踪ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "E3B3E544-3A82-4CC6-9990-29565144FCDF", - "uiHint": null - }, - { - "defKey": "user_id", - "defName": "操作人Id", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "2BB4581C-75E3-4BF0-B950-7763B3B8F262", - "uiHint": null - }, - { - "defKey": "user_code", - "defName": "操作人编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "730C2B19-43FB-4953-AF99-4EBF0BCFD2D4", - "uiHint": null - }, - { - "defKey": "user_name", - "defName": "操作人员名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "705E508E-9078-484A-9DBD-4358CD2CB333", - "uiHint": null - }, - { - "defKey": "user_name_en", - "defName": "操作人员英文名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "9CE4B2F6-701E-40E0-80F3-04B85C76F80C", - "uiHint": null - }, - { - "defKey": "user_language", - "defName": "用户系统语言", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "E8F6566A-0E29-473D-AFB0-DDDC08856F00", - "uiHint": null - }, - { - "defKey": "request_url", - "defName": "请求地址", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "F6D5555E-0274-45CC-9512-242CB26F8D40", - "uiHint": null - }, - { - "defKey": "request_method", - "defName": "请求方法", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "AF2ABAD0-733B-45D6-8BB1-FB2F061AE082", - "uiHint": null - }, - { - "defKey": "request_type", - "defName": "请求类型（POST、PUT、OPTIONS、DELETE）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "1C04A06D-18DB-47A5-9272-BAFF96504AAC", - "uiHint": null - }, - { - "defKey": "content_type", - "defName": "请求报文类型（map、json）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "E6ED5C20-5B8E-41C0-A46C-A67CDDE725FC", - "uiHint": null - }, - { - "defKey": "request_body", - "defName": "请求报文", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "B17BDED3-085F-40E1-9019-3B79CF2BF075", - "extProps": {}, - "domain": "3E948CEC-3070-472C-AF92-F3CA11EC9D15", - "id": "66B45E4A-11A4-4062-A94F-DA1C35CAFF52", - "uiHint": null - }, - { - "defKey": "request_time", - "defName": "请求时间", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7", - "extProps": {}, - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "id": "0D1146C8-A8B5-48BC-905D-D8B0B18D972B", - "uiHint": null - }, - { - "defKey": "response_body", - "defName": "响应报文", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "B17BDED3-085F-40E1-9019-3B79CF2BF075", - "extProps": {}, - "domain": "3E948CEC-3070-472C-AF92-F3CA11EC9D15", - "id": "2D3E2F4E-281F-4906-A3FF-87D65E85DA29", - "uiHint": null - }, - { - "defKey": "response_time", - "defName": "响应时间", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7", - "extProps": {}, - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "id": "41E395B5-2C49-4D4B-B710-AFFB746B9782", - "uiHint": null - }, - { - "defKey": "error_info", - "defName": "异常信息", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811", - "extProps": {}, - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "id": "9E18EBCD-B4AB-43C3-96EF-06E4D7D148D4", - "uiHint": null - }, - { - "defKey": "execute_time", - "defName": "请求耗时，单位：ms", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "id": "0EDBF7D8-5B3E-4772-A8CB-5DAFB526C011", - "uiHint": null - }, - { - "defKey": "platform", - "defName": "操作系统", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "7595A58A-8464-43BC-B0F5-4EB01BFBD102", - "uiHint": null - }, - { - "defKey": "browser", - "defName": "浏览器", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "325F6E70-FCDA-483F-AA4A-063ECF5E51E8", - "uiHint": null - }, - { - "defKey": "user_ip", - "defName": "操作人IP", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "84DACE00-5B5D-473A-88D3-94AD9960C253", - "uiHint": null - }, - { - "defKey": "ip_address", - "defName": "IP归属地址", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "6E69104B-745F-4051-A386-EDA184DB1511", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否成功（0失败 1成功）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "64DFDCA5-C354-4768-A8EF-1707644686D2", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "DF07804B-3E92-4399-8FDB-C223772EE54F", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "3881E7E2-2CAF-414C-B55B-9FA45157B84F", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "AB39B87A-ED84-4E94-84FE-C2C0365199EB", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "E855856F-E982-4BB5-8620-6BA897877481", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "427F1658-16D1-4F1A-A139-AC594D98CA4E", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "5A38D371-729E-45C0-9599-127874BDCF1B", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "3C1071BD-9628-4C70-B487-86B3A9CA0452", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "85D20DB1-023D-4213-A1F9-4A1CE9D119DF", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - }, - { - "id": "05873372-EC47-4A46-A0CB-650F2482C980", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_oauth_code", - "defName": "授权码", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "3E16AF1D-13A2-498F-BF5D-6A942EA408DF", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "app_key", - "defName": "分配给应用的appKey", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "1AD56A2B-5421-4708-BA71-0F58BA2D0CD4", - "uiHint": null - }, - { - "defKey": "auth_type", - "defName": "授权类型，此值固定为code", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "D6924769-D2D4-4B5D-B964-A89BA6BE0D8D", - "uiHint": null - }, - { - "defKey": "auth_code", - "defName": "授权码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "89DE2E27-6014-4FE3-B9F3-2AFCF6778BA8", - "uiHint": null - }, - { - "defKey": "redirect_url", - "defName": "用户登录前的回调地址", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "E10D2854-E80D-4DB7-B731-BAC953BC05E4", - "uiHint": null - }, - { - "defKey": "state", - "defName": "client端的状态值", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "161B5198-4146-4947-BCDA-393834BAD25E", - "uiHint": null - }, - { - "defKey": "user_id", - "defName": "用户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "2F388F86-4D3F-461B-B2B2-50FD9B856793" - }, - { - "defKey": "user_code", - "defName": "用户编码/员工工号", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "refDict": "", - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "445BD47E-C11C-4686-8E6A-16C4D104B9E4", - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C" - }, - { - "defKey": "ticket", - "defName": "登录凭证", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "87AF1977-D123-4A72-B17E-23B7A3D841F1", - "uiHint": null - }, - { - "defKey": "expires_time", - "defName": "过期时间", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7", - "extProps": {}, - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "id": "7023A630-B6FC-4D90-AA0F-76D2B0EF2C56", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "EF0DE30D-FBB6-4455-86E5-A8E6512691A9", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "E2669E5D-180F-4E7A-AC35-78DBE9D4EE83", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "EF49B31C-636F-480A-9FBB-56BA7DAD5131", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "7405C2F3-4F76-41B0-8431-87FDF4EE7D70", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "2D7AB634-B0F4-40B3-BA81-9C78AAA14FB8", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "134A9BEF-0CB9-422B-A9F6-730B677C3286", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "3608E261-D806-42EC-B0F4-2F7AB9A84F8E", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "7BB238F4-FD9D-445B-8887-25BBBEE43BD7", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "341700E7-E3FD-49B1-93A6-24A0D9BEFDF0", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - }, - { - "id": "ACD9E9AF-6A1B-4F6F-93F9-CE627F5659E5", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_access_token", - "defName": "鉴权令牌", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "11894802-602A-418D-9A92-AA5FCFD08E77", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "app_key", - "defName": "应用标识", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "0E5BB8DD-7CEE-4E27-A5BF-FE80C109F3EC", - "uiHint": null - }, - { - "defKey": "app_secret", - "defName": "应用密钥", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "0C870E17-860B-4FA5-9423-18E234F9AF31", - "uiHint": null - }, - { - "defKey": "access_token", - "defName": "鉴权令牌", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "D46F900A-CCF9-470D-A8A4-3E0681B35A04", - "uiHint": null - }, - { - "defKey": "refresh_token", - "defName": "刷新令牌", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "8068E11F-6FDB-4771-8F96-D818B71FEE8A", - "uiHint": null - }, - { - "defKey": "expires_time", - "defName": "过期时间", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7", - "extProps": {}, - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "id": "8F650F46-C0BF-40E4-924E-21B544724480", - "uiHint": null - }, - { - "defKey": "token_type", - "defName": "令牌类型（bearer mac）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "85A49B42-CDEF-468C-A00A-07DBD5E996C8", - "extProps": {}, - "domain": "C87E3277-0742-4453-BB85-ECF63F39872D", - "id": "9CC99001-CB8F-4433-ADF9-178077CC107C", - "uiHint": null - }, - { - "defKey": "token_scope", - "defName": "权限范围", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "85A49B42-CDEF-468C-A00A-07DBD5E996C8", - "extProps": {}, - "domain": "C87E3277-0742-4453-BB85-ECF63F39872D", - "id": "7189F69B-9840-42B0-8C4B-DC32D8FD6F43", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "6426E536-9D5C-4D7B-8175-AF1B7D63E035", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "9E4E4AFB-7DEC-4086-B49F-B1C6C27A8FBF", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "7F7BA309-9973-48B6-8CE4-753CC1514094", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "18351754-FD9B-434B-B263-275D585A934E", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "2AB05D44-8612-49C0-8E15-EB5C04B84B84", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "3D884A98-DAE5-49F4-B336-83599AF86CAC", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "37B98910-7B55-4A43-876A-594C4C879DE2", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "4B9E4AEB-24FB-4516-8311-64863E70DE51", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "F2A28F6A-B89F-4994-9A7B-66828DC33D0E", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - }, - { - "id": "7C03DFB6-95A5-4277-88CF-73E6B9D5EF8D", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_refresh_token", - "defName": "刷新令牌", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "DBF1483B-9E8F-49FB-BDBE-1B001FFC2CFB", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "access_token", - "defName": "鉴权令牌", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "FEC6C4E2-C9C9-42C0-A3AD-9E56C678B92A", - "uiHint": null - }, - { - "defKey": "refresh_token", - "defName": "刷新令牌", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "55C6108B-7326-410F-82EE-2E797C58C7DE", - "uiHint": null - }, - { - "defKey": "expires_time", - "defName": "过期时间", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "0557195D-6BDF-411D-9472-4AA6FB62E156", - "baseType": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7", - "uiHint": null - }, - { - "defKey": "latest_refresh_token", - "defName": "最新的刷新令牌", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "038036D3-73F9-42C5-A94F-D2EFBFB6CEFC", - "uiHint": null - }, - { - "defKey": "used", - "defName": "是否已用（0正常 1已用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "17801C18-302F-4477-BB8F-6170A146B779", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "3126950A-BCED-47B6-AE97-A05896F32F2C", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "2E6B0638-8543-4644-933B-012735967A36", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "73CDEB5C-AED0-4A3F-A95C-E7E05552FF41", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "CB0231BC-2EB8-4CA1-87AE-1E259DBE919D", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "A2F96B0E-4605-4A38-A262-AE548B9EE677", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "23BE782B-1349-4C5C-A55F-FCC51ECCBD75", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "281CA100-E53A-4D8B-A855-8652977E5CBC", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "9A71FF91-851F-4245-93AB-30C9086A8750", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "874A85DC-5EBD-4B4C-9B87-67CCC1226E4C", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - }, - { - "id": "BEA362C7-93D6-484D-B941-5B3B36821E56", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_config", - "defName": "全局配置", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "C43CD009-5E0B-4F78-99F0-AE5FDEDD86AA", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "bind_id", - "defName": "关联表ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "411DC480-A9C1-4288-A629-C7F6782177D1" - }, - { - "defKey": "bind_code", - "defName": "关联表编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "700DD6A4-46FE-4480-B9EF-64A363AFBBAD" - }, - { - "defKey": "conf_type", - "defName": "配置项类型（1用户信息 2应用配置 3主题配置 4邮件配置 5存储配置 6支付配置 99其他配置）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "CE1004FF-CF1C-4DEB-B661-1B5D5474E0B8", - "extProps": {}, - "domain": "7FCA70FD-7C0E-4A9D-97C6-1FEDFDA75C6D", - "id": "17B13C73-9627-4A25-BFC1-E120E81FD4FE", - "uiHint": null - }, - { - "defKey": "conf_code", - "defName": "配置项编码", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "FC1DC92D-6A70-4ACF-91FF-DC50ED534024", - "uiHint": null - }, - { - "defKey": "conf_name", - "defName": "配置项名称", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6", - "id": "5B8E0F00-CE68-4447-A976-C05B236862FB", - "uiHint": null - }, - { - "defKey": "conf_value", - "defName": "配置项的值", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "B17BDED3-085F-40E1-9019-3B79CF2BF075", - "extProps": {}, - "domain": "3E948CEC-3070-472C-AF92-F3CA11EC9D15", - "id": "E1464CCD-D643-4AF1-8AE4-61C897FFB66C", - "uiHint": null - }, - { - "defKey": "sort", - "defName": "字典项排序", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "65303E6C-8BE0-44F9-8184-689D9AE6D345", - "refDict": "", - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "62E48995-3492-4E40-BBD8-2DB03D4E9470", - "baseType": "6C3C997C-D2EB-435C-8B83-08A14EB3BD1A" - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "4AC51C2E-3462-41F2-8FAD-E8DE29BFE0E1", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "4E58048D-5B4B-4F08-8D76-338E75768D0F", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "3CA32162-5813-4434-BC80-36A64D7E482A", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "E6AEDE9E-696E-4608-880F-079D5E2E430F", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "F16CDCBD-66FB-4A5F-BE40-3190761D8A76", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "E6133D76-A6C8-4A79-A8FA-37EE1A7A7DCA", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "2759581A-F8DB-46A5-9246-0B30E64AA159", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "C91FE824-5D35-4C38-83E6-A4D4637E6D3A", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "57D3695F-24A8-42DE-A490-A2C58C902B75", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - }, - { - "id": "DFD28AA5-D291-4EB9-AB0F-AD8CE01224FC", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "sys_notice", - "defName": "通知公告", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "sysProps": { - "nameTemplate": "{defKey}[{defName}]" - }, - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "hideInGraph": false - }, - { - "refKey": "defName", - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "hideInGraph": false - }, - { - "refKey": "notNull", - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "hideInGraph": true - }, - { - "refKey": "domain", - "hideInGraph": true - }, - { - "refKey": "type", - "hideInGraph": false - }, - { - "refKey": "len", - "hideInGraph": false - }, - { - "refKey": "scale", - "hideInGraph": false - }, - { - "refKey": "comment", - "hideInGraph": true - }, - { - "refKey": "refDict", - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "hideInGraph": true - }, - { - "refKey": "isStandard", - "hideInGraph": false - }, - { - "refKey": "uiHint", - "hideInGraph": true - }, - { - "refKey": "extProps", - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "id", - "defName": "ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "99AD8401-9BA1-4390-A028-74B09C5B1E64", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "notice_title", - "defName": "通知标题", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "5E79FECE-344B-4366-9CD8-9F17535C1ED3" - }, - { - "defKey": "notice_type", - "defName": "通知类型（1通知公告 2系统消息）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "CE1004FF-CF1C-4DEB-B661-1B5D5474E0B8", - "extProps": {}, - "domain": "7FCA70FD-7C0E-4A9D-97C6-1FEDFDA75C6D", - "id": "88303FD3-6FB3-4085-A3F5-0A5E42300DF0", - "uiHint": null - }, - { - "defKey": "notice_icon", - "defName": "通知图标", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "extProps": {}, - "domain": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C", - "id": "8EBE28B8-A104-47DB-A101-F6F16F46F9E8", - "uiHint": null - }, - { - "defKey": "notice_content", - "defName": "通知内容", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "B17BDED3-085F-40E1-9019-3B79CF2BF075", - "extProps": {}, - "domain": "3E948CEC-3070-472C-AF92-F3CA11EC9D15", - "id": "F6E688A1-708E-44B4-B04C-ADBC73DD59B9", - "uiHint": null - }, - { - "defKey": "notice_content_en", - "defName": "通知英文内容", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "3E948CEC-3070-472C-AF92-F3CA11EC9D15", - "refDict": null, - "extProps": {}, - "notes": {}, - "attr1": "", - "attr2": "", - "attr3": "", - "attr4": "", - "attr5": "", - "attr6": "", - "attr7": "", - "attr8": "", - "attr9": "", - "id": "4D235BA4-B312-4D7F-B5EF-3084A73A204F", - "baseType": "B17BDED3-085F-40E1-9019-3B79CF2BF075", - "uiHint": null - }, - { - "defKey": "link_url", - "defName": "链接地址", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "3D9683E5-5EC9-460E-AC1F-4D60EBA5835F", - "uiHint": null - }, - { - "defKey": "status", - "defName": "是否启用（0停用 1启用）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "5D377811-9AFE-4336-96A8-C8734B8EA163", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "deleted", - "defName": "是否删除（0正常 1删除）", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF", - "id": "B96C743D-EE8A-45C1-944B-E577489D3F1F", - "baseType": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "uiHint": null - }, - { - "defKey": "revision", - "defName": "乐观锁", - "comment": "", - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "5284B9C7-A476-4DDD-AE2D-07E9F5BA24EE", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "dept_tenant_id", - "defName": "部门租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "id": "B52B23EA-27E9-4CF6-9E86-F55F417FAF64", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "uiHint": null - }, - { - "defKey": "company_tenant_id", - "defName": "公司租户ID", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "417920D0-8569-4B0F-8A39-D5A7372A0788", - "baseType": "B11C77FA-8557-4BCA-B423-212D7CD49695" - }, - { - "defKey": "created_by", - "defName": "创建人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "A6B61C06-F526-408B-93BD-33D0730A188B", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "created_at", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "114F2C8E-6FD8-4A25-B37F-1BFF389555D3", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - }, - { - "defKey": "updated_by", - "defName": "更新人", - "comment": "", - "domain": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "00ECD9F2-15CE-41C5-AD6D-DA4F64FFA600", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "updated_at", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "FEF07644-12AA-45CF-93C9-A2E6EC72DACB", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - } - ], - "correlations": [], - "indexes": [], - "type": "P" - } - ], - "views": [], - "dicts": [ - { - "defKey": "Gender", - "defName": "性别", - "intro": "", - "items": [ - { - "defKey": "M", - "defName": "男", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "sort": "1", - "id": "3622D417-DA1A-408F-BEE1-11D328D534A0" - }, - { - "defKey": "F", - "defName": "女", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "sort": "2", - "id": "380A0790-64A7-481E-831C-32F7BEE1502B" - }, - { - "defKey": "U", - "defName": "未知", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "sort": "3", - "id": "FA239F4D-1276-40D9-B230-F66BD35C3C27" - } - ], - "id": "BF9E20E0-80D3-486D-BD58-5FADCF3E4A1D" - }, - { - "defKey": "Political", - "defName": "政治面貌", - "intro": "", - "items": [ - { - "defKey": "10", - "defName": "共青团员", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "id": "61F3145A-7599-4CCB-B298-D5EE788107BE" - }, - { - "defKey": "20", - "defName": "中共党员", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "id": "ED16D25A-AB2F-4FA0-BB48-2B9031FA28C4" - }, - { - "defKey": "30", - "defName": "民主党派", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "id": "0FB7974A-AE11-438F-86E0-B163316F9272" - }, - { - "defKey": "40", - "defName": "群众", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "id": "7D247234-7E97-45B1-8C56-4A17A370854A" - }, - { - "defKey": "90", - "defName": "未知", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "id": "DA65D752-AF04-4A11-81D8-14A38692A64A" - } - ], - "id": "06EED564-BBA9-4747-8D73-AF809A330CB8" - }, - { - "defKey": "Marital", - "defName": "婚姻状况", - "intro": "婚姻状况的码表", - "items": [ - { - "defKey": "UNMARRIED", - "defName": "未婚", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "sort": "1", - "id": "20EE81BC-74EE-47DA-A56F-9663B23F44BD" - }, - { - "defKey": "MARRIED", - "defName": "已婚", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "sort": "2", - "id": "4DCA10A8-417E-4A8D-BDF6-0A278C060ADC" - }, - { - "defKey": "WIDOWED", - "defName": "丧偶", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "sort": "3", - "id": "826062A7-057C-4892-B338-06459F5B808D" - }, - { - "defKey": "DIVORCE", - "defName": "离婚", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "sort": "4", - "id": "B23200B4-5E59-4F5E-A779-D981A040FA32" - }, - { - "defKey": "UNSPECIFIED", - "defName": "未说明", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "sort": "5", - "id": "A7928FE2-349A-4702-9682-2EF7205E077B" - } - ], - "id": "EA1587B7-3954-437A-BFE0-FCB0453BCABA" - }, - { - "defKey": "StudentStatus", - "defName": "学生状态", - "intro": "", - "items": [ - { - "defKey": "Normal", - "defName": "正常", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "sort": "1", - "id": "E9CA1CC9-8851-4F6B-86BA-B9CF0E44EB73" - }, - { - "defKey": "Graduated", - "defName": "毕业", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "sort": "2", - "id": "DEC51D7C-99DF-430C-817D-0499862D3CCC" - }, - { - "defKey": "Studied", - "defName": "肄业", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "sort": "3", - "id": "8853D6B6-75D3-4479-9006-FC731CD85B20" - }, - { - "defKey": "Stop", - "defName": "休学", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "sort": "4", - "id": "C74BA8CF-1DC6-4C79-BAAC-F11EB9C6AF01" - } - ], - "id": "4642BC5F-02EE-4E17-A60C-CF22F86A0282" - }, - { - "defKey": "GBNation", - "defName": "民族", - "intro": "", - "items": [ - { - "defKey": "01", - "defName": "汉族", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "id": "9224DF53-F7C0-447D-B8ED-0A39F799EE19" - }, - { - "defKey": "02", - "defName": "蒙古族", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "id": "D57818E3-9206-45BB-AE79-27C64A4AB80F" - }, - { - "defKey": "03", - "defName": "回族", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "id": "0A1A3CA9-6D68-4E15-8BD0-9A2FF428D804" - }, - { - "defKey": "04", - "defName": "藏族", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "id": "7CC6B6BE-47EA-460E-ACFA-C377468DEA11" - }, - { - "defKey": "05", - "defName": "维吾尔族", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "id": "A666D51F-D249-4FAC-B1F3-78C371836CB3" - }, - { - "defKey": "06", - "defName": "苗族", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "id": "A0C9E1BA-D87B-4695-ADFA-287FDA32BB5A" - }, - { - "defKey": "07", - "defName": "彝族", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "id": "149B5B9E-C1D1-4790-8CCF-0ED5F4B25172" - }, - { - "defKey": "08", - "defName": "壮族", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "id": "F9A3E65C-BF4D-4C6B-ADB7-8C9CF0487360" - }, - { - "defKey": "09", - "defName": "布依族", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "id": "14F17DE4-E96A-460B-98A6-F84EC8CF9885" - }, - { - "defKey": "10", - "defName": "朝鲜族", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "id": "8A81AB18-B1BF-4797-A6E5-DEDB2C6566B0" - }, - { - "defKey": "11", - "defName": "满族", - "intro": "", - "parentKey": "", - "enabled": true, - "attr1": "", - "attr2": "", - "attr3": "", - "id": "7D460947-FBD2-4E4D-8366-3B38DCAF09D1" - } - ], - "id": "115EDEFC-0323-410E-81AB-CCAB8879837A" - }, - { - "defKey": "GradeLevel", - "defName": "受教育程度", - "sort": "", - "intro": "", - "items": [], - "id": "9E7C9788-B805-4C7D-8531-FD1D9DC79B05" - } - ], - "viewGroups": [], - "dataTypeMapping": { - "referURL": "", - "mappings": [ - { - "defKey": "ID", - "id": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "defName": "ID", - "DFBEC1DD-AA84-456E-BBF3-C95DD0DB2022": "VARCHAR", - "29D1CE08-4C35-4D2D-AAA9-23D93305B52E": "VARCHAR", - "A4E23CB7-BB01-4BD1-9F71-F73F3E15A542": "VARCHAR2", - "BFC87171-C74F-494A-B7C2-76B9C55FACC9": "VARCHAR" - }, - { - "defKey": "CODE", - "id": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "defName": "编码", - "DFBEC1DD-AA84-456E-BBF3-C95DD0DB2022": "VARCHAR", - "29D1CE08-4C35-4D2D-AAA9-23D93305B52E": "VARCHAR", - "A4E23CB7-BB01-4BD1-9F71-F73F3E15A542": "VARCHAR2", - "BFC87171-C74F-494A-B7C2-76B9C55FACC9": "VARCHAR" - }, - { - "defKey": "DICT", - "id": "85A49B42-CDEF-468C-A00A-07DBD5E996C8", - "defName": "字典", - "DFBEC1DD-AA84-456E-BBF3-C95DD0DB2022": "VARCHAR", - "29D1CE08-4C35-4D2D-AAA9-23D93305B52E": "VARCHAR", - "A4E23CB7-BB01-4BD1-9F71-F73F3E15A542": "VARCHAR2", - "BFC87171-C74F-494A-B7C2-76B9C55FACC9": "VARCHAR" - }, - { - "defKey": "YesNo", - "id": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "defName": "是否", - "DFBEC1DD-AA84-456E-BBF3-C95DD0DB2022": "INT2", - "29D1CE08-4C35-4D2D-AAA9-23D93305B52E": "INT", - "A4E23CB7-BB01-4BD1-9F71-F73F3E15A542": "INT", - "BFC87171-C74F-494A-B7C2-76B9C55FACC9": "INT" - }, - { - "defKey": "STATUS", - "id": "CE1004FF-CF1C-4DEB-B661-1B5D5474E0B8", - "defName": "状态", - "DFBEC1DD-AA84-456E-BBF3-C95DD0DB2022": "INT2", - "29D1CE08-4C35-4D2D-AAA9-23D93305B52E": "INT", - "A4E23CB7-BB01-4BD1-9F71-F73F3E15A542": "INT", - "BFC87171-C74F-494A-B7C2-76B9C55FACC9": "INT" - }, - { - "defKey": "SORT", - "id": "6C3C997C-D2EB-435C-8B83-08A14EB3BD1A", - "defName": "排序", - "DFBEC1DD-AA84-456E-BBF3-C95DD0DB2022": "INT4", - "29D1CE08-4C35-4D2D-AAA9-23D93305B52E": "INT", - "A4E23CB7-BB01-4BD1-9F71-F73F3E15A542": "INT", - "BFC87171-C74F-494A-B7C2-76B9C55FACC9": "INT" - }, - { - "defKey": "int", - "id": "1D764C4A-6F9F-421E-B11A-6F3E23B51811", - "defName": "整数", - "29D1CE08-4C35-4D2D-AAA9-23D93305B52E": "INT", - "A4E23CB7-BB01-4BD1-9F71-F73F3E15A542": "INT", - "BFC87171-C74F-494A-B7C2-76B9C55FACC9": "INT", - "DFBEC1DD-AA84-456E-BBF3-C95DD0DB2022": "INT8", - "89504F5D-94BF-4C9E-8B2E-44F37305FED5": "INT", - "0BBCABA5-B8E4-41B0-B8E4-8F5EA6029307": "INTEGER", - "592C7013-143D-4E7B-AF64-0D7BF1E28230": "INTEGER", - "77BD85E5-9D0D-4096-8427-CBA306FC9C6A": "INT4", - "11D1FB71-A587-4217-89BA-611B8A1F83E0": "INT", - "B363BE0B-F852-49B8-9B2E-F6D2174DEAC1": "INTEGER", - "797A1496-D649-4261-89B4-544132EC3F36": "Integer", - "895CFD1D-4273-4D32-A2C4-CAC70200AB5B": "Integer", - "A2EE7B4A-CE62-4290-B00C-B26C1BF18073": "Integer", - "F3AC2415-E86B-40C6-9FEB-F4B7937D2C30": "float", - "81CCA482-3F4D-4EAC-8CF9-F5E7BC098AD2": "int", - "B91D99E0-9B7C-416C-8737-B760957DAF09": "*int" - }, - { - "defKey": "double", - "id": "1A0BDC09-0792-4174-9E8E-80BE8DF44B8E", - "defName": "小数", - "29D1CE08-4C35-4D2D-AAA9-23D93305B52E": "DECIMAL", - "A4E23CB7-BB01-4BD1-9F71-F73F3E15A542": "DECIMAL", - "BFC87171-C74F-494A-B7C2-76B9C55FACC9": "DECIMAL", - "DFBEC1DD-AA84-456E-BBF3-C95DD0DB2022": "NUMERIC", - "89504F5D-94BF-4C9E-8B2E-44F37305FED5": "DECIMAL", - "0BBCABA5-B8E4-41B0-B8E4-8F5EA6029307": "DECIMAL", - "592C7013-143D-4E7B-AF64-0D7BF1E28230": "NUMERIC", - "77BD85E5-9D0D-4096-8427-CBA306FC9C6A": "NUMERIC", - "11D1FB71-A587-4217-89BA-611B8A1F83E0": "DOUBLE", - "B363BE0B-F852-49B8-9B2E-F6D2174DEAC1": "REAL", - "797A1496-D649-4261-89B4-544132EC3F36": "Double", - "895CFD1D-4273-4D32-A2C4-CAC70200AB5B": "Double", - "A2EE7B4A-CE62-4290-B00C-B26C1BF18073": "Double", - "F3AC2415-E86B-40C6-9FEB-F4B7937D2C30": "decimal", - "81CCA482-3F4D-4EAC-8CF9-F5E7BC098AD2": "double", - "B91D99E0-9B7C-416C-8737-B760957DAF09": "*float64" - }, - { - "defKey": "date", - "id": "89D69E81-EA34-42EE-9FA2-93B8BD27E098", - "defName": "日期", - "29D1CE08-4C35-4D2D-AAA9-23D93305B52E": "DATE", - "A4E23CB7-BB01-4BD1-9F71-F73F3E15A542": "DATE", - "BFC87171-C74F-494A-B7C2-76B9C55FACC9": "DATETIME", - "DFBEC1DD-AA84-456E-BBF3-C95DD0DB2022": "TIMESTAMP", - "89504F5D-94BF-4C9E-8B2E-44F37305FED5": "DATE", - "0BBCABA5-B8E4-41B0-B8E4-8F5EA6029307": "DATE", - "592C7013-143D-4E7B-AF64-0D7BF1E28230": "DATE", - "77BD85E5-9D0D-4096-8427-CBA306FC9C6A": "DATE", - "11D1FB71-A587-4217-89BA-611B8A1F83E0": "DATETIME", - "B363BE0B-F852-49B8-9B2E-F6D2174DEAC1": "NUMERIC", - "797A1496-D649-4261-89B4-544132EC3F36": "Date", - "895CFD1D-4273-4D32-A2C4-CAC70200AB5B": "Date", - "A2EE7B4A-CE62-4290-B00C-B26C1BF18073": "Date", - "F3AC2415-E86B-40C6-9FEB-F4B7937D2C30": "DateTime", - "81CCA482-3F4D-4EAC-8CF9-F5E7BC098AD2": "timestamp", - "B91D99E0-9B7C-416C-8737-B760957DAF09": "*time.Time" - }, - { - "defKey": "datetime", - "id": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7", - "defName": "日期时间", - "29D1CE08-4C35-4D2D-AAA9-23D93305B52E": "DATETIME", - "A4E23CB7-BB01-4BD1-9F71-F73F3E15A542": "DATE", - "BFC87171-C74F-494A-B7C2-76B9C55FACC9": "DATETIME", - "DFBEC1DD-AA84-456E-BBF3-C95DD0DB2022": "TIMESTAMP", - "89504F5D-94BF-4C9E-8B2E-44F37305FED5": "DATE", - "0BBCABA5-B8E4-41B0-B8E4-8F5EA6029307": "DATE", - "592C7013-143D-4E7B-AF64-0D7BF1E28230": "DATE", - "77BD85E5-9D0D-4096-8427-CBA306FC9C6A": "DATE", - "11D1FB71-A587-4217-89BA-611B8A1F83E0": "DATETIME", - "B363BE0B-F852-49B8-9B2E-F6D2174DEAC1": "NUMERIC", - "797A1496-D649-4261-89B4-544132EC3F36": "LocalDateTime", - "895CFD1D-4273-4D32-A2C4-CAC70200AB5B": "Date", - "A2EE7B4A-CE62-4290-B00C-B26C1BF18073": "Date", - "F3AC2415-E86B-40C6-9FEB-F4B7937D2C30": "DateTime", - "81CCA482-3F4D-4EAC-8CF9-F5E7BC098AD2": "timestamp", - "B91D99E0-9B7C-416C-8737-B760957DAF09": "*time.Time" - }, - { - "defKey": "string", - "id": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "defName": "字符串", - "29D1CE08-4C35-4D2D-AAA9-23D93305B52E": "VARCHAR", - "A4E23CB7-BB01-4BD1-9F71-F73F3E15A542": "VARCHAR2", - "BFC87171-C74F-494A-B7C2-76B9C55FACC9": "VARCHAR", - "DFBEC1DD-AA84-456E-BBF3-C95DD0DB2022": "VARCHAR", - "89504F5D-94BF-4C9E-8B2E-44F37305FED5": "VARCHAR", - "0BBCABA5-B8E4-41B0-B8E4-8F5EA6029307": "VARCHAR2", - "592C7013-143D-4E7B-AF64-0D7BF1E28230": "VARCHAR", - "77BD85E5-9D0D-4096-8427-CBA306FC9C6A": "VARCHAR", - "11D1FB71-A587-4217-89BA-611B8A1F83E0": "STRING", - "B363BE0B-F852-49B8-9B2E-F6D2174DEAC1": "TEXT", - "797A1496-D649-4261-89B4-544132EC3F36": "String", - "895CFD1D-4273-4D32-A2C4-CAC70200AB5B": "String", - "A2EE7B4A-CE62-4290-B00C-B26C1BF18073": "String", - "F3AC2415-E86B-40C6-9FEB-F4B7937D2C30": "string", - "81CCA482-3F4D-4EAC-8CF9-F5E7BC098AD2": "string", - "B91D99E0-9B7C-416C-8737-B760957DAF09": "string" - }, - { - "defKey": "bytes", - "id": "D516E75B-90F5-4741-B9B3-A186A263F04C", - "defName": "二进制", - "29D1CE08-4C35-4D2D-AAA9-23D93305B52E": "BLOB", - "A4E23CB7-BB01-4BD1-9F71-F73F3E15A542": "BLOB", - "BFC87171-C74F-494A-B7C2-76B9C55FACC9": "VARBINARY", - "DFBEC1DD-AA84-456E-BBF3-C95DD0DB2022": "BYTEA", - "89504F5D-94BF-4C9E-8B2E-44F37305FED5": "BLOB", - "0BBCABA5-B8E4-41B0-B8E4-8F5EA6029307": "BLOB", - "592C7013-143D-4E7B-AF64-0D7BF1E28230": "BYTEA", - "77BD85E5-9D0D-4096-8427-CBA306FC9C6A": "BYTEA", - "11D1FB71-A587-4217-89BA-611B8A1F83E0": "BINARY", - "B363BE0B-F852-49B8-9B2E-F6D2174DEAC1": "NONE", - "797A1496-D649-4261-89B4-544132EC3F36": "byte[]", - "895CFD1D-4273-4D32-A2C4-CAC70200AB5B": "byte[]", - "A2EE7B4A-CE62-4290-B00C-B26C1BF18073": "byte[]", - "F3AC2415-E86B-40C6-9FEB-F4B7937D2C30": "binary", - "81CCA482-3F4D-4EAC-8CF9-F5E7BC098AD2": "binary", - "B91D99E0-9B7C-416C-8737-B760957DAF09": "[]byte" - }, - { - "defKey": "largeText", - "id": "B17BDED3-085F-40E1-9019-3B79CF2BF075", - "defName": "大文本", - "29D1CE08-4C35-4D2D-AAA9-23D93305B52E": "TEXT", - "A4E23CB7-BB01-4BD1-9F71-F73F3E15A542": "CLOB", - "BFC87171-C74F-494A-B7C2-76B9C55FACC9": "TEXT", - "DFBEC1DD-AA84-456E-BBF3-C95DD0DB2022": "TEXT", - "89504F5D-94BF-4C9E-8B2E-44F37305FED5": "CLOB", - "0BBCABA5-B8E4-41B0-B8E4-8F5EA6029307": "CLOB", - "592C7013-143D-4E7B-AF64-0D7BF1E28230": "TEXT", - "77BD85E5-9D0D-4096-8427-CBA306FC9C6A": "TEXT", - "11D1FB71-A587-4217-89BA-611B8A1F83E0": "STRING", - "B363BE0B-F852-49B8-9B2E-F6D2174DEAC1": "TEXT", - "797A1496-D649-4261-89B4-544132EC3F36": "String", - "895CFD1D-4273-4D32-A2C4-CAC70200AB5B": "String", - "A2EE7B4A-CE62-4290-B00C-B26C1BF18073": "String", - "F3AC2415-E86B-40C6-9FEB-F4B7937D2C30": "string", - "81CCA482-3F4D-4EAC-8CF9-F5E7BC098AD2": "string", - "B91D99E0-9B7C-416C-8737-B760957DAF09": "string" - } - ] - }, - "domains": [ - { - "defKey": "IdOrKey", - "defName": "ID", - "applyFor": "B11C77FA-8557-4BCA-B423-212D7CD49695", - "len": 19, - "scale": "", - "uiHint": "", - "id": "16120F75-6AA7-4483-868D-F07F511BB081" - }, - { - "defKey": "CODE", - "defName": "编码", - "applyFor": "89F707EF-104B-4CB0-94EE-94FA1288D21C", - "len": 64, - "scale": "", - "uiHint": "", - "id": "44982D87-E05E-40EE-B0DC-20BDFC2B0B9C" - }, - { - "defKey": "Name", - "defName": "名称", - "applyFor": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "len": 128, - "scale": "", - "uiHint": "", - "id": "54611CCC-CA4B-42E1-9F32-4944C85B85A6" - }, - { - "defKey": "DICT", - "defName": "字典", - "applyFor": "85A49B42-CDEF-468C-A00A-07DBD5E996C8", - "len": 64, - "scale": "", - "uiHint": "", - "id": "C87E3277-0742-4453-BB85-ECF63F39872D" - }, - { - "defKey": "YesNo", - "defName": "是否", - "applyFor": "D2DA399F-6B5D-436A-A0A6-9DF0EC3E967E", - "len": "", - "scale": "", - "uiHint": "", - "id": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF" - }, - { - "defKey": "Status", - "defName": "状态", - "applyFor": "CE1004FF-CF1C-4DEB-B661-1B5D5474E0B8", - "len": "", - "scale": "", - "uiHint": "", - "id": "7FCA70FD-7C0E-4A9D-97C6-1FEDFDA75C6D" - }, - { - "defKey": "SORT", - "defName": "排序", - "applyFor": "6C3C997C-D2EB-435C-8B83-08A14EB3BD1A", - "len": "", - "scale": "", - "uiHint": "", - "id": "65303E6C-8BE0-44F9-8184-689D9AE6D345" - }, - { - "defKey": "Int", - "defName": "整数", - "applyFor": "1D764C4A-6F9F-421E-B11A-6F3E23B51811", - "len": "", - "scale": "", - "uiHint": "", - "id": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E" - }, - { - "defKey": "Double", - "defName": "小数", - "applyFor": "1A0BDC09-0792-4174-9E8E-80BE8DF44B8E", - "len": 12, - "scale": 3, - "uiHint": "", - "id": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4" - }, - { - "defKey": "Money", - "defName": "金额", - "applyFor": "1A0BDC09-0792-4174-9E8E-80BE8DF44B8E", - "len": 24, - "scale": 6, - "uiHint": "", - "id": "C3B1681B-99F9-4818-9E80-DE1652A51D85" - }, - { - "defKey": "userName", - "defName": "用户名", - "applyFor": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "len": 64, - "scale": "", - "uiHint": "", - "id": "D2A4B23A-2673-40B5-94DB-3D7DE6480C8C" - }, - { - "defKey": "DefaultString", - "defName": "字符串", - "applyFor": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "len": 255, - "scale": "", - "uiHint": "", - "id": "9092C4E0-1A54-4859-ABBB-5B62DBC27573" - }, - { - "defKey": "Date", - "defName": "年月日", - "applyFor": "89D69E81-EA34-42EE-9FA2-93B8BD27E098", - "len": "", - "scale": "", - "uiHint": "", - "id": "314093CD-F021-4772-81C0-AB65BBE81F4B" - }, - { - "defKey": "DateTime", - "defName": "日期时间", - "applyFor": "783CF9F8-8AB5-4227-9D7B-10B2A940CAB7", - "len": "", - "scale": "", - "uiHint": "", - "id": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC" - }, - { - "defKey": "Dict", - "defName": "数据字典", - "applyFor": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", - "len": "32", - "scale": "", - "uiHint": "", - "id": "73FD2BAD-2358-4336-B96D-45DC897BD792" - }, - { - "defKey": "DescText", - "defName": "描述文本", - "applyFor": "B17BDED3-085F-40E1-9019-3B79CF2BF075", - "len": "", - "scale": "", - "uiHint": "", - "id": "3E948CEC-3070-472C-AF92-F3CA11EC9D15" - } - ], - "diagrams": [ - { - "defKey": "relation1", - "defName": "统一身份关系图", - "relationType": "field", - "canvasData": { - "cells": [ - { - "id": "cb72ae87-ab03-4b33-84fd-dfae1314b05f", - "shape": "table", - "position": { - "x": -820, - "y": -10 - }, - "count": 0, - "originKey": "3B2F5CEA-2417-4369-B801-44E8CEF2937D", - "type": "P", - "size": { - "width": 468, - "height": 491 - } - }, - { - "id": "e7e05105-f170-458f-a404-e1b98e1bff17", - "shape": "table", - "position": { - "x": -820, - "y": 877 - }, - "count": 0, - "originKey": "652BBA45-496C-406E-B371-9AFC8A38E6C9", - "type": "P", - "size": { - "width": 487, - "height": 238 - } - }, - { - "id": "5f8e9bc3-d21c-4676-861e-6e75280d2449", - "shape": "table", - "position": { - "x": 439, - "y": 877 - }, - "count": 0, - "originKey": "73D14190-2AF6-4483-8551-FB05017F971F", - "type": "P", - "size": { - "width": 480, - "height": 307 - } - }, - { - "id": "b8c9fd36-20e9-4f41-8d54-a2734f5ac5eb", - "shape": "erdRelation", - "source": { - "cell": "cb72ae87-ab03-4b33-84fd-dfae1314b05f", - "port": "2A632BC5-4D3E-4E2D-8563-360864DE7CEA%in" - }, - "target": { - "cell": "e092ba17-375a-42ee-9f1c-8381cbc558a4", - "port": "84EA8776-FAA0-4A2E-81FA-BEBDF3A25BD5%in" - }, - "relation": "1:n", - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "51f791b7-c1f7-4c02-a6cd-dce8c2937165", - "shape": "erdRelation", - "source": { - "cell": "cb72ae87-ab03-4b33-84fd-dfae1314b05f", - "port": "CED73178-24F4-456A-A27F-20112CD15742%in" - }, - "target": { - "cell": "e092ba17-375a-42ee-9f1c-8381cbc558a4", - "port": "A4EB2F63-0D15-48BB-B1E1-30AE51920040%in" - }, - "relation": "1:n", - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "0793bba4-8d8d-4aa0-8dcb-9985038f86f7", - "shape": "erdRelation", - "source": { - "cell": "b490a3b2-01cc-4888-ba72-acf65917c74c", - "port": "0162B3D8-A57D-4BB0-BA62-B93D186D5F40%in" - }, - "target": { - "cell": "e092ba17-375a-42ee-9f1c-8381cbc558a4", - "port": "684544A7-6E6A-4FBE-A598-60D04C218D5E%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": -210, - "y": -90 - } - ], - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "b5083ed5-66e2-42e3-ad5e-1dde2ea90e44", - "shape": "erdRelation", - "source": { - "cell": "b490a3b2-01cc-4888-ba72-acf65917c74c", - "port": "637F72DD-E1BB-45CC-9F66-45B74C534E66%in" - }, - "target": { - "cell": "e092ba17-375a-42ee-9f1c-8381cbc558a4", - "port": "178BD105-7708-484C-94DC-8B89486E461A%out" - }, - "relation": "1:n", - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "aab6135e-d204-4c9e-ae9c-c2eab6272779", - "shape": "erdRelation", - "source": { - "cell": "b490a3b2-01cc-4888-ba72-acf65917c74c", - "port": "0162B3D8-A57D-4BB0-BA62-B93D186D5F40%out" - }, - "target": { - "cell": "33816f61-e956-4b98-a710-f5e41ed61657", - "port": "AD98BD85-0B48-4897-B918-62B51EC0EF82%in" - }, - "relation": "1:n", - "vertices": [ - { - "x": 240, - "y": -160 - } - ], - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "1074bc79-9571-4bb8-b35d-a92102f10989", - "shape": "erdRelation", - "source": { - "cell": "b490a3b2-01cc-4888-ba72-acf65917c74c", - "port": "637F72DD-E1BB-45CC-9F66-45B74C534E66%out" - }, - "target": { - "cell": "33816f61-e956-4b98-a710-f5e41ed61657", - "port": "0D759E74-7E21-4B8C-BF69-E18A261C6B38%in" - }, - "relation": "1:n", - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "fce168bf-459e-4269-ac83-8e596f2f37a7", - "shape": "erdRelation", - "source": { - "cell": "6287cd36-aee9-4573-9e2c-e1574c6e42df", - "port": "E6BC3D5B-9881-4469-978C-13D38D40ABA5%out" - }, - "target": { - "cell": "33816f61-e956-4b98-a710-f5e41ed61657", - "port": "2C1F8096-F5EC-4FF2-AFD6-DE9A04E2D7FB%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": 950, - "y": -110 - } - ], - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "f6e7429d-8a65-4b45-b6f7-8b96022d02e1", - "shape": "erdRelation", - "source": { - "cell": "6287cd36-aee9-4573-9e2c-e1574c6e42df", - "port": "EBB47498-3D33-4D68-A539-D6B5AAB0F7DB%out" - }, - "target": { - "cell": "33816f61-e956-4b98-a710-f5e41ed61657", - "port": "FCAAE5D0-F2F4-4906-930A-6A4E30D2D31C%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": 950, - "y": -120 - } - ], - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "fdc0f538-34e3-4049-80e4-1228eab6d202", - "shape": "erdRelation", - "source": { - "cell": "6287cd36-aee9-4573-9e2c-e1574c6e42df", - "port": "E6BC3D5B-9881-4469-978C-13D38D40ABA5%in" - }, - "target": { - "cell": "5b78b18b-8ad8-4101-a197-61730c05f058", - "port": "F4C6AA00-6A2D-4117-8299-59701ADB67A5%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": 300, - "y": 240 - } - ], - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "482ae24f-05ec-4971-9bc8-3db318915dd1", - "shape": "erdRelation", - "source": { - "cell": "6287cd36-aee9-4573-9e2c-e1574c6e42df", - "port": "EBB47498-3D33-4D68-A539-D6B5AAB0F7DB%in" - }, - "target": { - "cell": "5b78b18b-8ad8-4101-a197-61730c05f058", - "port": "063CF308-5BFB-407A-B985-517FC346C415%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": 300, - "y": 400 - } - ], - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "bf6d6700-f06d-4820-b8ec-02ffa56486ef", - "shape": "erdRelation", - "source": { - "cell": "143774ed-65f1-453a-afe1-af5ecd55275b", - "port": "CF36FB9C-2016-4588-A20B-60B2E3170FBF%in" - }, - "target": { - "cell": "e7e05105-f170-458f-a404-e1b98e1bff17", - "port": "9443CA30-A5B1-4815-9BAC-7BEBCB99BE02%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": -280, - "y": 961 - } - ], - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "f6a97eb5-8c4a-4610-a350-072e05362f62", - "shape": "erdRelation", - "source": { - "cell": "143774ed-65f1-453a-afe1-af5ecd55275b", - "port": "8A92CEFA-587A-40E3-B66B-E46AF4ADA931%in" - }, - "target": { - "cell": "e7e05105-f170-458f-a404-e1b98e1bff17", - "port": "F19AB899-C199-4E00-966C-2DD9DB390D3C%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": -280, - "y": 938 - } - ], - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "160ea265-1c97-4d9b-bd7a-eb8f153ed346", - "shape": "erdRelation", - "source": { - "cell": "143774ed-65f1-453a-afe1-af5ecd55275b", - "port": "0C78CEF7-ED78-4F24-899D-44F3CD74C7CA%in" - }, - "target": { - "cell": "5b78b18b-8ad8-4101-a197-61730c05f058", - "port": "89EDB47D-F631-4219-BDF4-6DDDD313ABA7%in" - }, - "relation": "1:n", - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "825df2a9-3df8-4cec-a201-b29aadff8b2d", - "shape": "erdRelation", - "source": { - "cell": "143774ed-65f1-453a-afe1-af5ecd55275b", - "port": "F9B5A04C-181D-490D-ADF7-46F981C59191%in" - }, - "target": { - "cell": "5b78b18b-8ad8-4101-a197-61730c05f058", - "port": "4236EEEF-DD5C-473C-981D-9B975C5238F7%in" - }, - "relation": "1:n", - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "f8da9bdf-1563-4cf2-a118-5582bf09b69a", - "shape": "erdRelation", - "source": { - "cell": "5f8e9bc3-d21c-4676-861e-6e75280d2449", - "port": "154DFA59-8019-4DEB-A046-DFBEB4EA97D6%in" - }, - "target": { - "cell": "143774ed-65f1-453a-afe1-af5ecd55275b", - "port": "0C78CEF7-ED78-4F24-899D-44F3CD74C7CA%out" - }, - "relation": "1:n", - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "580e3484-94c7-418e-93ef-707f0cb1ce85", - "shape": "erdRelation", - "source": { - "cell": "5f8e9bc3-d21c-4676-861e-6e75280d2449", - "port": "2EDFCDC5-7653-409E-AACF-0ABB26D55ECF%in" - }, - "target": { - "cell": "143774ed-65f1-453a-afe1-af5ecd55275b", - "port": "F9B5A04C-181D-490D-ADF7-46F981C59191%out" - }, - "relation": "1:n", - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "25b39954-7397-4655-934b-ee3c02ffed7c", - "shape": "erdRelation", - "source": { - "cell": "5f8e9bc3-d21c-4676-861e-6e75280d2449", - "port": "0C04029E-0A20-4CE8-8B8A-C1F6129DAFE7%in" - }, - "target": { - "cell": "5b78b18b-8ad8-4101-a197-61730c05f058", - "port": "96DEA5EB-737F-4549-AC97-20E89B9BC8E7%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": 390, - "y": 840 - } - ], - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "83f1e0fa-03cf-43ff-bd76-8d5c329ae771", - "shape": "erdRelation", - "source": { - "cell": "5f8e9bc3-d21c-4676-861e-6e75280d2449", - "port": "C980F665-8803-4C60-A5F2-8D23ED54ABEA%in" - }, - "target": { - "cell": "5b78b18b-8ad8-4101-a197-61730c05f058", - "port": "1C481536-F359-4259-BB9C-B6DD6B34ECE4%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": 390, - "y": 770 - } - ], - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "5b78b18b-8ad8-4101-a197-61730c05f058", - "shape": "table", - "position": { - "x": -190, - "y": 454 - }, - "count": 0, - "originKey": "22796924-B341-4B94-93A1-2123FCA89F40", - "type": "P", - "size": { - "width": 453, - "height": 238 - } - }, - { - "id": "143774ed-65f1-453a-afe1-af5ecd55275b", - "shape": "table", - "position": { - "x": -201, - "y": 877 - }, - "count": 0, - "originKey": "DB399458-8885-4780-91A9-C2D296B849EE", - "type": "P", - "size": { - "width": 503, - "height": 284 - } - }, - { - "id": "33816f61-e956-4b98-a710-f5e41ed61657", - "shape": "table", - "position": { - "x": 290, - "y": -400 - }, - "count": 0, - "originKey": "747C4415-1A06-4C1C-BB94-89D2075E367B", - "type": "P", - "size": { - "width": 472, - "height": 215 - } - }, - { - "id": "e092ba17-375a-42ee-9f1c-8381cbc558a4", - "shape": "table", - "position": { - "x": -760, - "y": -390 - }, - "count": 0, - "originKey": "AEFA4B13-9C1B-49AC-AA08-42098FDA0C1F", - "type": "P", - "size": { - "width": 472, - "height": 215 - } - }, - { - "id": "b490a3b2-01cc-4888-ba72-acf65917c74c", - "shape": "table", - "position": { - "x": -190, - "y": 20 - }, - "count": 0, - "originKey": "216FE788-B005-4A62-8454-DEC889EEC7F2", - "type": "P", - "size": { - "width": 408, - "height": 261 - } - }, - { - "id": "9083cf9d-f314-4660-a2cd-96e8ecd5922b", - "shape": "erdRelation", - "source": { - "cell": "6287cd36-aee9-4573-9e2c-e1574c6e42df", - "port": "E6BC3D5B-9881-4469-978C-13D38D40ABA5%out" - }, - "target": { - "cell": "d986e92c-9038-4be6-aa40-56f93bc4587d", - "port": "6BEFB17A-C20B-4173-8A86-AAAE8C72C4ED%in" - }, - "relation": "1:n", - "vertices": [ - { - "x": 1000, - "y": 340 - }, - { - "x": 1000, - "y": 515 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "feac2bff-e5d3-4b56-bbf8-0c2b73229943", - "shape": "erdRelation", - "source": { - "cell": "6287cd36-aee9-4573-9e2c-e1574c6e42df", - "port": "EBB47498-3D33-4D68-A539-D6B5AAB0F7DB%out" - }, - "target": { - "cell": "d986e92c-9038-4be6-aa40-56f93bc4587d", - "port": "6237F734-9F43-48A0-835A-F8DAC4A00F98%in" - }, - "relation": "1:n", - "vertices": [ - { - "x": 1000, - "y": 500 - }, - { - "x": 1000, - "y": 538 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "6287cd36-aee9-4573-9e2c-e1574c6e42df", - "shape": "table", - "position": { - "x": 410, - "y": 10 - }, - "count": 0, - "originKey": "F2125A91-B961-4C4D-8D13-3E0A2533944B", - "type": "P", - "size": { - "width": 509, - "height": 583 - } - }, - { - "id": "1280e4e4-1c0f-4af9-83c9-9cd9158ed83e", - "shape": "erdRelation", - "source": { - "cell": "6318a879-8cd9-47b2-ab71-9eada042b376", - "port": "96DC0F05-251A-4F30-A4B1-BC70F4B31863%in" - }, - "target": { - "cell": "d986e92c-9038-4be6-aa40-56f93bc4587d", - "port": "9DC87F92-5D7D-4CB6-8758-1D1CD8451CF9%in" - }, - "relation": "1:n", - "vertices": [ - { - "x": 1000, - "y": 561 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "7167510d-9a28-4505-ad1a-9f99aeb58ab8", - "shape": "erdRelation", - "source": { - "cell": "6318a879-8cd9-47b2-ab71-9eada042b376", - "port": "7E5FA4C0-75FF-47FD-9C8B-1F5A5BA4A7D9%in" - }, - "target": { - "cell": "d986e92c-9038-4be6-aa40-56f93bc4587d", - "port": "228825B4-CDF6-4535-99B3-E5134EC83ED3%in" - }, - "relation": "1:n", - "vertices": [ - { - "x": 1000, - "y": 740 - }, - { - "x": 1000, - "y": 584 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "d986e92c-9038-4be6-aa40-56f93bc4587d", - "shape": "table", - "position": { - "x": 1228, - "y": 454 - }, - "count": 0, - "originKey": "1D4284A2-F010-4718-A2DD-7C7224268C95", - "type": "P", - "size": { - "width": 438, - "height": 215 - } - }, - { - "id": "6318a879-8cd9-47b2-ab71-9eada042b376", - "shape": "table", - "position": { - "x": 1178, - "y": 877 - }, - "count": 0, - "originKey": "1B15A892-70F3-4A4A-8E8E-8CA16F920B74", - "type": "P", - "size": { - "width": 488, - "height": 238 - } - } - ] - }, - "id": "4098BE0C-A861-415C-A3C3-B2F68436560F", - "comment": "" - }, - { - "defKey": "relation2", - "defName": "统一权限关系图", - "relationType": "field", - "canvasData": { - "cells": [ - { - "id": "1da544c4-d9a2-40e3-8e0d-bae781262352", - "shape": "table", - "position": { - "x": -1060, - "y": 217 - }, - "count": 0, - "originKey": "C3673587-7A3B-422B-90F7-6903E613887A", - "type": "P", - "size": { - "width": 476, - "height": 353 - } - }, - { - "id": "55e6e62c-44fa-45af-a889-c5c418c41a07", - "shape": "table", - "position": { - "x": -404, - "y": 240 - }, - "count": 0, - "originKey": "775B18E0-24B0-408A-8811-34C4DCFB9BCD", - "type": "P", - "size": { - "width": 476, - "height": 307 - } - }, - { - "id": "698f6483-826f-41e9-8b3f-47d0ef5d8ca0", - "shape": "table", - "position": { - "x": 210, - "y": 297.5 - }, - "count": 0, - "originKey": "FB9B8C90-DCBD-4EFF-AD8C-2D0EF80D8C1A", - "type": "P", - "size": { - "width": 436, - "height": 192 - } - }, - { - "id": "0ca12aec-fc40-4c55-9000-6024b5c1e796", - "shape": "table", - "position": { - "x": 800, - "y": 182.5 - }, - "count": 0, - "originKey": "DB2B6124-567F-4BB0-9C74-7359D504E70E", - "type": "P", - "size": { - "width": 572, - "height": 422 - } - }, - { - "id": "b417e5aa-f570-408e-b2c0-f50190d3e935", - "shape": "erdRelation", - "source": { - "cell": "55e6e62c-44fa-45af-a889-c5c418c41a07", - "port": "6E732BDE-2AEC-40A1-8C4D-2072FA6A6B75%in" - }, - "target": { - "cell": "1da544c4-d9a2-40e3-8e0d-bae781262352", - "port": "44B37017-23A7-4215-AAB6-927AFB6F4A86%out" - }, - "relation": "1:n", - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "ecd1e945-477f-4790-ae49-0fbde02dee20", - "shape": "erdRelation", - "source": { - "cell": "55e6e62c-44fa-45af-a889-c5c418c41a07", - "port": "6E732BDE-2AEC-40A1-8C4D-2072FA6A6B75%out" - }, - "target": { - "cell": "698f6483-826f-41e9-8b3f-47d0ef5d8ca0", - "port": "B13ABEF0-F7A0-4DA1-B309-793E157E776F%in" - }, - "relation": "1:n", - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "1b5506b4-71c6-4bbb-b70a-490f3742999c", - "shape": "erdRelation", - "source": { - "cell": "55e6e62c-44fa-45af-a889-c5c418c41a07", - "port": "F943F1D5-656D-4CB4-986D-DFBC0E460C69%out" - }, - "target": { - "cell": "698f6483-826f-41e9-8b3f-47d0ef5d8ca0", - "port": "80605C79-F4DD-460A-ABDC-AEAC79839239%in" - }, - "relation": "1:n", - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "d0134335-a2bb-46fc-acbc-f0d3ddfeb618", - "shape": "erdRelation", - "source": { - "cell": "0ca12aec-fc40-4c55-9000-6024b5c1e796", - "port": "37A7ECF8-763E-4267-9670-94E7CCDD6C0C%in" - }, - "target": { - "cell": "698f6483-826f-41e9-8b3f-47d0ef5d8ca0", - "port": "ECAA5FA9-1515-48EB-83DF-A465A395F109%out" - }, - "relation": "1:n", - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "62bb4180-996c-4364-aa91-df333096ff39", - "shape": "erdRelation", - "source": { - "cell": "0ca12aec-fc40-4c55-9000-6024b5c1e796", - "port": "7448D389-0538-479F-AD9D-943E6FB68B42%in" - }, - "target": { - "cell": "698f6483-826f-41e9-8b3f-47d0ef5d8ca0", - "port": "5B15FBEA-2E5D-4C79-B563-517031FFD09A%out" - }, - "relation": "1:n", - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "db79e3dd-db2f-4b4b-8758-345faa467779", - "shape": "erdRelation", - "source": { - "cell": "0ca12aec-fc40-4c55-9000-6024b5c1e796", - "port": "37A7ECF8-763E-4267-9670-94E7CCDD6C0C%out" - }, - "target": { - "cell": "8a535c80-6f1d-4486-abfe-ae492fd47d42", - "port": "9881E189-37F4-415A-8BE0-1EBAA195CA16%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": 1400, - "y": 850 - } - ], - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "84e0c1c2-1f1a-4206-9570-cf723a403321", - "shape": "erdRelation", - "source": { - "cell": "0ca12aec-fc40-4c55-9000-6024b5c1e796", - "port": "7448D389-0538-479F-AD9D-943E6FB68B42%out" - }, - "target": { - "cell": "8a535c80-6f1d-4486-abfe-ae492fd47d42", - "port": "0F8545C8-7330-4F1B-A7E0-D1E075A8E90A%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": 1400, - "y": 650 - } - ], - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "b902290c-420c-40b0-9fa4-7d8b8bb9d1d7", - "shape": "erdRelation", - "source": { - "cell": "f4eb61f2-9c27-4d51-96a8-40ee3b9f33a6", - "port": "7F9EC828-8962-4923-95C6-009CEE1C7E6D%out" - }, - "target": { - "cell": "8a535c80-6f1d-4486-abfe-ae492fd47d42", - "port": "C8887765-A039-418D-AFEC-92522C0269AC%in" - }, - "relation": "1:n", - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "fef86071-446c-467b-a09d-37d1d9b7cdb6", - "shape": "erdRelation", - "source": { - "cell": "f4eb61f2-9c27-4d51-96a8-40ee3b9f33a6", - "port": "4ED36842-98D4-418A-9CEB-8871719844EA%out" - }, - "target": { - "cell": "8a535c80-6f1d-4486-abfe-ae492fd47d42", - "port": "DFE5818A-2FC8-44B9-9EF1-CA8C1F517737%in" - }, - "relation": "1:n", - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "0966742b-d4a8-4969-b190-b158bcdd64dd", - "shape": "erdRelation", - "source": { - "cell": "42d86005-d1dd-4acf-acba-f723aa33be59", - "port": "0162B3D8-A57D-4BB0-BA62-B93D186D5F40%out" - }, - "target": { - "cell": "0c560b5e-ff1e-479e-8189-8ca4b721f7f9", - "port": "455D8461-1911-4E0B-881C-92D3FB416352%in" - }, - "relation": "1:n", - "vertices": [ - { - "x": -1200, - "y": 712 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "192c8bb1-4268-45ba-bef6-99a4445605e5", - "shape": "erdRelation", - "source": { - "cell": "42d86005-d1dd-4acf-acba-f723aa33be59", - "port": "637F72DD-E1BB-45CC-9F66-45B74C534E66%out" - }, - "target": { - "cell": "0c560b5e-ff1e-479e-8189-8ca4b721f7f9", - "port": "A228CBED-0FA5-49F1-8D87-8EB8227B022F%in" - }, - "relation": "1:n", - "vertices": [ - { - "x": -1200, - "y": 735 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "c8915d1c-7b2b-499b-b91b-2bf10dffc316", - "shape": "erdRelation", - "source": { - "cell": "f4eb61f2-9c27-4d51-96a8-40ee3b9f33a6", - "port": "7F9EC828-8962-4923-95C6-009CEE1C7E6D%in" - }, - "target": { - "cell": "0c560b5e-ff1e-479e-8189-8ca4b721f7f9", - "port": "3C7049D9-D2E4-4819-9CAE-DD0806B18C2F%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": -380, - "y": 781 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "31a9654d-f301-45bd-b71f-89ef1beec503", - "shape": "erdRelation", - "source": { - "cell": "f4eb61f2-9c27-4d51-96a8-40ee3b9f33a6", - "port": "4ED36842-98D4-418A-9CEB-8871719844EA%in" - }, - "target": { - "cell": "0c560b5e-ff1e-479e-8189-8ca4b721f7f9", - "port": "27D60758-9060-4057-AE92-1B4E0515E771%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": -380, - "y": 901 - }, - { - "x": -380, - "y": 804 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "c4ed5fb3-015e-45f8-bdc9-68d1b0d16221", - "shape": "erdRelation", - "source": { - "cell": "f4eb61f2-9c27-4d51-96a8-40ee3b9f33a6", - "port": "4ED36842-98D4-418A-9CEB-8871719844EA%in" - }, - "target": { - "cell": "dcfb4930-8182-4f16-8b4d-f953ba283f06", - "port": "E65C808D-6D46-4409-8710-FFB9D5E3ED9D%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": -380, - "y": 1106 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "0c560b5e-ff1e-479e-8189-8ca4b721f7f9", - "shape": "table", - "position": { - "x": -1022, - "y": 651 - }, - "count": 0, - "originKey": "56D3BA96-F1BF-41DE-B05C-9C14EDF17881", - "type": "P", - "size": { - "width": 438, - "height": 215 - } - }, - { - "id": "0953cddd-25fc-48a2-b3c0-4a7dd831da6c", - "shape": "erdRelation", - "source": { - "cell": "a6680ec7-aae2-4eff-b490-5ea858fd058e", - "port": "F4C6AA00-6A2D-4117-8299-59701ADB67A5%out" - }, - "target": { - "cell": "dcfb4930-8182-4f16-8b4d-f953ba283f06", - "port": "02D7FA9A-CC76-4D0B-8ABC-769D1467C369%in" - }, - "relation": "1:n", - "vertices": [ - { - "x": -1210, - "y": 1037 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "bd9189fd-4e75-4d4e-bd39-972fc1c3b266", - "shape": "erdRelation", - "source": { - "cell": "a6680ec7-aae2-4eff-b490-5ea858fd058e", - "port": "BF52F5F9-F8FC-4234-B313-C0CAD0AA9980%out" - }, - "target": { - "cell": "dcfb4930-8182-4f16-8b4d-f953ba283f06", - "port": "68D8A782-296A-43B9-9798-2E2EB71EE019%in" - }, - "relation": "1:n", - "vertices": [ - { - "x": -1210, - "y": 1060 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "cbf73f00-addb-4b53-879d-ee30435054f9", - "shape": "erdRelation", - "source": { - "cell": "f4eb61f2-9c27-4d51-96a8-40ee3b9f33a6", - "port": "7F9EC828-8962-4923-95C6-009CEE1C7E6D%in" - }, - "target": { - "cell": "dcfb4930-8182-4f16-8b4d-f953ba283f06", - "port": "D076B3B7-E615-48AA-9B10-D61F8CDC44DF%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": -380, - "y": 1083 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "81d21452-5fd6-46f0-a115-dec1c54e5e10", - "shape": "erdRelation", - "source": { - "cell": "f4eb61f2-9c27-4d51-96a8-40ee3b9f33a6", - "port": "7F9EC828-8962-4923-95C6-009CEE1C7E6D%in" - }, - "target": { - "cell": "75012702-4a9b-466f-b063-51e26a3a5a71", - "port": "01FF490D-8EC1-4EA5-B708-E6214702B513%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": -380, - "y": 1397 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "57b7db0b-499f-442b-860d-cd57b86b9f5b", - "shape": "erdRelation", - "source": { - "cell": "f4eb61f2-9c27-4d51-96a8-40ee3b9f33a6", - "port": "4ED36842-98D4-418A-9CEB-8871719844EA%in" - }, - "target": { - "cell": "75012702-4a9b-466f-b063-51e26a3a5a71", - "port": "1137ED37-CC99-499E-A17C-B23D4F7ECDA4%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": -380, - "y": 1420 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "0aafd2da-ddfc-4549-b2b1-5dba50b56188", - "shape": "erdRelation", - "source": { - "cell": "f4eb61f2-9c27-4d51-96a8-40ee3b9f33a6", - "port": "7F9EC828-8962-4923-95C6-009CEE1C7E6D%in" - }, - "target": { - "cell": "97a84f43-923a-47ec-9e58-1e832a8152cc", - "port": "A96B5D8A-5105-4256-8F29-1974A42827C7%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": -380, - "y": 1735 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "7bb7752e-3e95-498e-845c-1bb638027e3f", - "shape": "erdRelation", - "source": { - "cell": "f4eb61f2-9c27-4d51-96a8-40ee3b9f33a6", - "port": "4ED36842-98D4-418A-9CEB-8871719844EA%in" - }, - "target": { - "cell": "97a84f43-923a-47ec-9e58-1e832a8152cc", - "port": "E39468CF-30F0-4712-A22C-869EA24F2DD2%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": -380, - "y": 1758 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "42d86005-d1dd-4acf-acba-f723aa33be59", - "shape": "table", - "position": { - "x": -1751, - "y": 582 - }, - "count": 0, - "originKey": "216FE788-B005-4A62-8454-DEC889EEC7F2", - "type": "P", - "size": { - "width": 478, - "height": 284 - } - }, - { - "id": "a6680ec7-aae2-4eff-b490-5ea858fd058e", - "shape": "table", - "position": { - "x": -1726, - "y": 953 - }, - "count": 0, - "originKey": "22796924-B341-4B94-93A1-2123FCA89F40", - "type": "P", - "size": { - "width": 453, - "height": 215 - } - }, - { - "id": "c9788a4c-7de6-4190-8aa2-ab4b1af9cd4e", - "shape": "erdRelation", - "source": { - "cell": "97a84f43-923a-47ec-9e58-1e832a8152cc", - "port": "96112A96-16A6-41E2-AB80-B4C3C42ACDB5%in" - }, - "target": { - "cell": "74125f8f-9760-4552-aae4-4c176e4e2338", - "port": "9DC87F92-5D7D-4CB6-8758-1D1CD8451CF9%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": -1200, - "y": 1735 - } - ], - "fillColor": "#ACDAFC", - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "be20b3bf-9acd-4a91-9538-6ef3691ae787", - "shape": "erdRelation", - "source": { - "cell": "97a84f43-923a-47ec-9e58-1e832a8152cc", - "port": "E1C4381E-CAAB-4052-8AE4-B4865332AE06%in" - }, - "target": { - "cell": "74125f8f-9760-4552-aae4-4c176e4e2338", - "port": "228825B4-CDF6-4535-99B3-E5134EC83ED3%out" - }, - "relation": "1:n", - "vertices": [ - { - "x": -1200, - "y": 1758 - } - ], - "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, - "attrs": { - "line": { - "strokeDasharray": "" - } - } - }, - { - "id": "74125f8f-9760-4552-aae4-4c176e4e2338", - "shape": "table", - "position": { - "x": -1711, - "y": 1628 - }, - "count": 0, - "originKey": "1D4284A2-F010-4718-A2DD-7C7224268C95", - "type": "P", - "size": { - "width": 438, - "height": 215 - } - }, - { - "id": "dcfb4930-8182-4f16-8b4d-f953ba283f06", - "shape": "table", - "position": { - "x": -1012, - "y": 976 - }, - "count": 0, - "originKey": "C57C4006-7B7B-45F6-B10C-BDA5B0AAC2F1", - "type": "P", - "size": { - "width": 428, - "height": 192 - } - }, - { - "id": "75012702-4a9b-466f-b063-51e26a3a5a71", - "shape": "table", - "position": { - "x": -1012, - "y": 1290 - }, - "count": 0, - "originKey": "C7533EC5-6E4F-43B8-9F11-09640372F7E5", - "type": "P", - "size": { - "width": 428, - "height": 192 - } - }, - { - "id": "97a84f43-923a-47ec-9e58-1e832a8152cc", - "shape": "table", - "position": { - "x": -1022, - "y": 1628 - }, - "count": 0, - "originKey": "D3ACD8DD-4114-4773-B785-BD3AF7A4FF16", - "type": "P", - "size": { - "width": 438, - "height": 192 - } - }, - { - "id": "f4eb61f2-9c27-4d51-96a8-40ee3b9f33a6", - "shape": "table", - "position": { - "x": -173, - "y": 1167 - }, - "count": 0, - "originKey": "86660DB3-B3CA-4066-A317-BD6136C204EA", - "type": "P", - "size": { - "width": 819, - "height": 284 - } - }, - { - "id": "8a535c80-6f1d-4486-abfe-ae492fd47d42", - "shape": "table", - "position": { - "x": 932, - "y": 1142 - }, - "count": 0, - "originKey": "F4F0C3D5-2A29-466C-A787-D01DD13FCBE7", - "type": "P", - "size": { - "width": 436, - "height": 192 - } - } - ] - }, - "id": "A02F35B7-ECDB-4D53-B570-5DA2A916C29D", - "comment": "" - } - ], - "standardFields": [ - { - "defKey": "personInfo", - "defName": "个人基本信息要素", - "fields": [ - { - "defKey": "ID_CARD_NO", - "defName": "证件号码", - "comment": "", - "type": "VARCHAR", - "len": "60", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "refDict": "", - "uiHint": "", - "id": "A64A91C8-A41F-4113-92FB-7563D7EF054D", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "MOBILE_PHONE", - "defName": "手机号", - "comment": "", - "type": "VARCHAR", - "len": "60", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "refDict": "", - "uiHint": "", - "id": "479DA2AB-1974-411A-A81E-92FB939E75EB", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "GENDER", - "defName": "性别", - "comment": "", - "type": "VARCHAR", - "len": "32", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792", - "refDict": "BF9E20E0-80D3-486D-BD58-5FADCF3E4A1D", - "uiHint": "", - "id": "48473E29-6594-4912-AADE-C8AB44FCA3E9", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "BIRTH", - "defName": "出生日期", - "comment": "", - "type": "DATETIME", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "refDict": "", - "uiHint": "", - "id": "2BD3D2EE-2411-49A6-983D-84B81057312F", - "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" - }, - { - "defKey": "AVATAR", - "defName": "头像", - "comment": "", - "type": "VARCHAR", - "len": "60", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "refDict": "", - "uiHint": "", - "id": "FDD67CEE-4B52-4BD1-A1A3-9C5EBC6037E6", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "HEIGHT", - "defName": "身高", - "comment": "", - "type": "INT", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "refDict": "", - "uiHint": "", - "id": "CAAA0E79-41A1-4758-B481-D171168C4D68", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "WEIGHT", - "defName": "体重", - "comment": "", - "type": "INT", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "refDict": "", - "uiHint": "", - "id": "575482CE-64A6-4CB9-99DC-8E126D190AAA", - "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811" - }, - { - "defKey": "NATION", - "defName": "名族", - "comment": "", - "type": "VARCHAR", - "len": "32", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792", - "refDict": "115EDEFC-0323-410E-81AB-CCAB8879837A", - "uiHint": "", - "id": "15B0D75D-0B97-4985-A816-D0EAFA90446B", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "POLITICAL", - "defName": "政治面貌", - "comment": "", - "type": "VARCHAR", - "len": "32", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792", - "refDict": "06EED564-BBA9-4747-8D73-AF809A330CB8", - "uiHint": "", - "id": "F458E86D-84D6-45A1-9DD3-51E6C8170D7F", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "MARITAL", - "defName": "婚姻状况", - "comment": "", - "type": "VARCHAR", - "len": "32", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792", - "refDict": "EA1587B7-3954-437A-BFE0-FCB0453BCABA", - "uiHint": "", - "id": "7275E578-6893-4922-AC69-95B261BFBD61", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "DOMICILE_PLACE_PROVINCE", - "defName": "籍贯（省）", - "comment": "", - "type": "VARCHAR", - "len": "60", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "refDict": "", - "uiHint": "", - "id": "F04BF130-3EC1-4E02-9DED-3214CA88E352", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "DOMICILE_PLACE_CITY", - "defName": "籍贯（市）", - "comment": "", - "type": "VARCHAR", - "len": "32", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792", - "refDict": "", - "uiHint": "", - "id": "B97F5BC2-33DE-4857-9DB8-ECFD02C9040C", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - }, - { - "defKey": "DOMICILE_PLACE_ADDRESS", - "defName": "户籍地址", - "comment": "", - "type": "VARCHAR", - "len": "60", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "refDict": "", - "uiHint": "", - "id": "812ADF1D-8C03-40CA-B030-E539838FB889", - "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64" - } - ], - "id": "F30202B9-4B5D-4CE7-87CE-B3890C84D3F2" - } - ], - "dbConn": [ - { - "defKey": "5BD2695A-1430-49D9-9ECD-D180AA73F477", - "defName": "CRM", - "type": "29D1CE08-4C35-4D2D-AAA9-23D93305B52E", - "properties": { - "driver_class_name": "com.mysql.cj.jdbc.Driver", - "url": "jdbc:mysql://192.168.31.66:3306/remi-saas-crm?characterEncoding=UTF-8&useSSL=false&useUnicode=true&serverTimezone=UTC", - "password": "123456", - "username": "root" - } - } - ], - "namingRules": [ - { - "id": "63F1DC0E-6A76-4B75-B3DA-4B00657B4E1B", - "defName": "属性代码不能超过32", - "intro": "", - "controlIntensity": "S", - "applyObjectType": "L", - "applyFieldType": "field", - "programCode": "return (data.field.defName||\"\").length <= 32", - "enable": true - }, - { - "id": "668CBEE6-E0B7-4ACE-B72E-63942963B191", - "defName": "长度不能超过32位", - "intro": "", - "controlIntensity": "F", - "applyObjectType": "P", - "applyFieldType": "entity", - "programCode": "return (data.entity.defName||\"\").length <= 32", - "enable": true - }, - { - "id": "11BD987F-82E7-418E-A752-FDD84F1582A2", - "defName": "长度不能超过32位", - "intro": "", - "controlIntensity": "F", - "applyObjectType": "P", - "applyFieldType": "field", - "programCode": "return (data.field.defName||\"\").length <= 32", - "enable": true - }, - { - "id": "29D0A8D9-ABE2-451F-8A39-52FAB02E62B9", - "defName": "索引名-长度不超过32个字符", - "intro": "", - "controlIntensity": "S", - "applyObjectType": "P", - "applyFieldType": "index", - "programCode": "return (data.index.defName||\"\").length <= 32", - "enable": true - }, - { - "id": "B425A96F-6A31-4DBD-8743-A00DE28FB50F", - "defName": "不能使用保留字", - "intro": "", - "controlIntensity": "S", - "applyObjectType": "P", - "applyFieldType": "index", - "programCode": "let sysWords = \"action,add,aggregate,all,alter,after,and,as,asc,avg,avg_row_length,auto_increment,between,bigint,bit,binary,blob,bool,both,by,cascade,case,char,character,change,check,checksum,column,columns,comment,constraint,create,cross,current_date,current_time,current_timestamp,data,database,databases,date,datetime,day,day_hour,day_minute,day_second,dayofmonth,dayofweek,dayofyear,dec,decimal,default,delayed,delay_key_write,delete,desc,describe,distinct,distinctrow,double,drop,end,else,escape,escaped,enclosed,enum,explain,exists,fields,file,first,float,float4,float8,flush,foreign,from,for,full,function,global,grant,grants,group,having,heap,high_priority,hour,hour_minute,hour_second,hosts,identified,ignore,in,index,infile,inner,insert,insert_id,int,integer,interval,int1,int2,int3,int4,int8,into,if,is,isam,join,key,keys,kill,last_insert_id,leading,left,length,like,lines,limit,load,local,lock,logs,long,longblob,longtext,low_priority,max,max_rows,match,mediumblob,mediumtext,mediumint,middleint,min_rows,minute,minute_second,modify,month,monthname,myisam,natural,numeric,no,not,null,on,optimize,option,optionally,or,order,outer,outfile,pack_keys,partial,password,precision,primary,procedure,process,processlist,privileges,read,real,references,reload,regexp,rename,replace,restrict,returns,revoke,rlike,row,rows,second,select,set,show,shutdown,smallint,soname,sql_big_tables,sql_big_selects,sql_low_priority_updates,sql_log_off,sql_log_update,sql_select_limit,sql_small_result,sql_big_result,sql_warnings,straight_join,starting,status,string,table,tables,temporary,terminated,text,then,time,timestamp,tinyblob,tinytext,tinyint,trailing,to,type,use,using,unique,unlock,unsigned,update,usage,values,varchar,variables,varying,varbinary,with,write,when,where,year,year_month,zerofill\".split(\",\");\nreturn sysWords.indexOf(data.index.defKey.toLowerCase())<0;", - "enable": true - }, - { - "id": "EF9E44D0-691A-4352-A079-CFF300107531", - "defName": "索引名-全小写", - "intro": "", - "controlIntensity": "F", - "applyObjectType": "P", - "applyFieldType": "index", - "programCode": "return !/[A-Z]+/.test(data.index.defKey);", - "enable": true - }, - { - "id": "972EB2FB-4428-429D-8B0A-F082A8C7A94D", - "defName": "名称不能为空", - "intro": "", - "controlIntensity": "F", - "applyObjectType": "L", - "applyFieldType": "entity", - "programCode": "return data.logicEntity.defName", - "enable": true - }, - { - "id": "EEAEB9C5-BB6C-4E92-949B-D27928690D85", - "defName": "名称长度不超过32", - "intro": "", - "controlIntensity": "S", - "applyObjectType": "L", - "applyFieldType": "entity", - "programCode": "return (data.logicEntity.defName||\"\").length <=32", - "enable": true - }, - { - "id": "24E3F7E5-730D-4378-B72D-195D6B940352", - "defName": "不能使用保留字", - "intro": "", - "controlIntensity": "F", - "applyObjectType": "P", - "applyFieldType": "entity", - "programCode": "let sysWords = \"action,add,aggregate,all,alter,after,and,as,asc,avg,avg_row_length,auto_increment,between,bigint,bit,binary,blob,bool,both,by,cascade,case,char,character,change,check,checksum,column,columns,comment,constraint,create,cross,current_date,current_time,current_timestamp,data,database,databases,date,datetime,day,day_hour,day_minute,day_second,dayofmonth,dayofweek,dayofyear,dec,decimal,default,delayed,delay_key_write,delete,desc,describe,distinct,distinctrow,double,drop,end,else,escape,escaped,enclosed,enum,explain,exists,fields,file,first,float,float4,float8,flush,foreign,from,for,full,function,global,grant,grants,group,having,heap,high_priority,hour,hour_minute,hour_second,hosts,identified,ignore,in,index,infile,inner,insert,insert_id,int,integer,interval,int1,int2,int3,int4,int8,into,if,is,isam,join,key,keys,kill,last_insert_id,leading,left,length,like,lines,limit,load,local,lock,logs,long,longblob,longtext,low_priority,max,max_rows,match,mediumblob,mediumtext,mediumint,middleint,min_rows,minute,minute_second,modify,month,monthname,myisam,natural,numeric,no,not,null,on,optimize,option,optionally,or,order,outer,outfile,pack_keys,partial,password,precision,primary,procedure,process,processlist,privileges,read,real,references,reload,regexp,rename,replace,restrict,returns,revoke,rlike,row,rows,second,select,set,show,shutdown,smallint,soname,sql_big_tables,sql_big_selects,sql_low_priority_updates,sql_log_off,sql_log_update,sql_select_limit,sql_small_result,sql_big_result,sql_warnings,straight_join,starting,status,string,table,tables,temporary,terminated,text,then,time,timestamp,tinyblob,tinytext,tinyint,trailing,to,type,use,using,unique,unlock,unsigned,update,usage,values,varchar,variables,varying,varbinary,with,write,when,where,year,year_month,zerofill\".split(\",\");\nreturn sysWords.indexOf(data.entity.defKey.toLowerCase())<0;", - "enable": true - }, - { - "id": "039BF435-DC77-4DA4-81C7-7F8076BF22BB", - "defName": "表名-全小写", - "intro": "", - "controlIntensity": "S", - "applyObjectType": "P", - "applyFieldType": "entity", - "programCode": "return !/[A-Z]+/.test(data.entity.defKey);", - "enable": true - }, - { - "id": "CBEB0E30-19C6-427D-A8BF-61FF10E27A0B", - "defName": "表名-不允许空格", - "intro": "", - "controlIntensity": "F", - "applyObjectType": "P", - "applyFieldType": "entity", - "programCode": "return !/\\s+/.test(data.entity.defKey);", - "enable": true - }, - { - "id": "1168C7C2-8E8E-4FB7-B639-B3DE839C395A", - "defName": "表名-英文及下划线", - "intro": "", - "controlIntensity": "F", - "applyObjectType": "P", - "applyFieldType": "entity", - "programCode": "return /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(data.entity.defKey);", - "enable": true - }, - { - "id": "D373637C-D3A6-4621-B656-6841A5444A76", - "defName": "表必须有comment注释", - "intro": "", - "controlIntensity": "S", - "applyObjectType": "P", - "applyFieldType": "entity", - "programCode": "return (data.entity.defName||\"\").length > 0 || (data.entity.comment||\"\").length > 0", - "enable": true - }, - { - "id": "2BAB122B-8811-40BB-89F3-CDC24B5862D3", - "defName": "主键命名为 id，类型为 int 或 bigint，且为自增", - "intro": "", - "controlIntensity": "S", - "applyObjectType": "P", - "applyFieldType": "entity", - "programCode": "let fields = data.entity.fields;\nfor(let i=0;i=0){\n count ++;\n }\n}\nreturn count==2;", - "enable": true - }, - { - "id": "BEC54F19-52D5-4882-BCE1-4439785F8001", - "defName": "不能使用保留字", - "intro": "", - "controlIntensity": "S", - "applyObjectType": "P", - "applyFieldType": "field", - "programCode": "let sysWords = \"action,add,aggregate,all,alter,after,and,as,asc,avg,avg_row_length,auto_increment,between,bigint,bit,binary,blob,bool,both,by,cascade,case,char,character,change,check,checksum,column,columns,comment,constraint,create,cross,current_date,current_time,current_timestamp,data,database,databases,date,datetime,day,day_hour,day_minute,day_second,dayofmonth,dayofweek,dayofyear,dec,decimal,default,delayed,delay_key_write,delete,desc,describe,distinct,distinctrow,double,drop,end,else,escape,escaped,enclosed,enum,explain,exists,fields,file,first,float,float4,float8,flush,foreign,from,for,full,function,global,grant,grants,group,having,heap,high_priority,hour,hour_minute,hour_second,hosts,identified,ignore,in,index,infile,inner,insert,insert_id,int,integer,interval,int1,int2,int3,int4,int8,into,if,is,isam,join,key,keys,kill,last_insert_id,leading,left,length,like,lines,limit,load,local,lock,logs,long,longblob,longtext,low_priority,max,max_rows,match,mediumblob,mediumtext,mediumint,middleint,min_rows,minute,minute_second,modify,month,monthname,myisam,natural,numeric,no,not,null,on,optimize,option,optionally,or,order,outer,outfile,pack_keys,partial,password,precision,primary,procedure,process,processlist,privileges,read,real,references,reload,regexp,rename,replace,restrict,returns,revoke,rlike,row,rows,second,select,set,show,shutdown,smallint,soname,sql_big_tables,sql_big_selects,sql_low_priority_updates,sql_log_off,sql_log_update,sql_select_limit,sql_small_result,sql_big_result,sql_warnings,straight_join,starting,status,string,table,tables,temporary,terminated,text,then,time,timestamp,tinyblob,tinytext,tinyint,trailing,to,type,use,using,unique,unlock,unsigned,update,usage,values,varchar,variables,varying,varbinary,with,write,when,where,year,year_month,zerofill\".split(\",\");\nreturn sysWords.indexOf(data.field.defKey.toLowerCase())<0;", - "enable": true - }, - { - "id": "082E186D-7B02-4F1C-9ECE-378AB98C4845", - "defName": "字段-全小写", - "intro": "", - "controlIntensity": "S", - "applyObjectType": "P", - "applyFieldType": "field", - "programCode": "return !/[A-Z]+/.test(data.field.defKey);", - "enable": true - }, - { - "id": "F3CE5C67-23B6-4E7B-BA91-D5F0BCBC9E6A", - "defName": "字段-不允许空格", - "intro": "", - "controlIntensity": "F", - "applyObjectType": "P", - "applyFieldType": "field", - "programCode": "return !/\\s+/.test(data.field.defKey);", - "enable": true - }, - { - "id": "21AFEAC8-96D7-467F-8320-A33887FC0C5D", - "defName": "字段-英文及下划线", - "intro": "", - "controlIntensity": "F", - "applyObjectType": "P", - "applyFieldType": "field", - "programCode": "return /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(data.field.defKey);", - "enable": true - }, - { - "id": "2BBDE47B-6926-4E1A-AE57-D4F6E5399EE6", - "defName": "字段-必需有comment注释", - "intro": "", - "controlIntensity": "F", - "applyObjectType": "P", - "applyFieldType": "field", - "programCode": "return (data.field.defName||\"\").length > 0 || (data.field.comment||\"\").length > 0", - "enable": true - }, - { - "id": "5E181E43-0D72-498F-8178-4C1CDBC89A16", - "defName": "字段-不能与表名相同", - "intro": "", - "controlIntensity": "F", - "applyObjectType": "P", - "applyFieldType": "field", - "programCode": "return data.field.defKey != data.entity.defKey;", - "enable": true - }, - { - "id": "DE8F8598-5D53-4727-A837-7816C2AF99D9", - "defName": "外键-字段必须具有表名及其主键", - "intro": "", - "controlIntensity": "S", - "applyObjectType": "P", - "applyFieldType": "field", - "programCode": "let relas = data.entity.correlations;\nfor(let i=0;i=0 || data.field.defName.lastIndexOf(\"时间\")>=0 ){\n if(data.field.dbType.toLowerCase().indexOf(\"date\")>=0){\n return true;\n }else{\n return false;\n }\n};\nreturn true;", - "enable": true - }, - { - "id": "2E7FDA44-989A-4C5B-A0C5-12B1E40E57B1", - "defName": "索引名-英文及下划线", - "intro": "", - "controlIntensity": "S", - "applyObjectType": "P", - "applyFieldType": "index", - "programCode": "return /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(data.index.defKey);", - "enable": true - }, - { - "id": "023450B3-AAE2-4DC1-AE63-2196DD82823D", - "defName": "索引名-主键的名称以pk_开头，唯一键以uk_开头，普通索引以 ix_开头", - "intro": "", - "controlIntensity": "S", - "applyObjectType": "P", - "applyFieldType": "index", - "programCode": "if(data.index.unique){\n return data.index.defKey.indexOf(\"uk_\")==0;\n}else{\n return data.index.defKey.indexOf(\"ix_\")==0;\n}", - "enable": true - }, - { - "id": "1C563E17-262B-4EB6-87F0-203CAC667CF0", - "defName": "不允许存在blob、text等大字段", - "intro": "", - "controlIntensity": "S", - "applyObjectType": "P", - "applyFieldType": "field", - "programCode": "if(\"blob,text\".indexOf(data.field.dbType.toLowerCase())>=0){\n return false;\n}\nreturn true;", - "enable": true - } - ] -} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 81f354e..bed5159 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ai.remi.top.cloud remi-cloud - 3.1.1 + 3.1.0 pom remi-cloud Remi Cloud @@ -18,7 +18,10 @@ - 3.1.1 + 3.1.0 + 3.1.0 + 3.1.0 + 3.1.0 17 ${java.version} @@ -104,9 +107,9 @@ remi-comm - remi-nacos - remi-sys + remi-boot remi-demo + remi-nacos @@ -137,427 +140,7 @@ pom ${spring-cloud-alibaba.version} - - - - - ai.remi.top.cloud - remi-comm - ${remi.version} - - - ai.remi.top.cloud - remi-comm-core - ${remi.version} - - - ai.remi.top.cloud - remi-comm-minio - ${remi.version} - - - ai.remi.top.cloud - remi-comm-redis - ${remi.version} - - - ai.remi.top.cloud - remi-comm-jdbc - ${remi.version} - - - ai.remi.top.cloud - remi-comm-domain - ${remi.version} - - - ai.remi.top.cloud - remi-comm-exception - ${remi.version} - - - ai.remi.top.cloud - remi-comm-feign - ${remi.version} - - - ai.remi.top.cloud - remi-comm-job - ${remi.version} - - - ai.remi.top.cloud - remi-comm-log - ${remi.version} - - - ai.remi.top.cloud - remi-comm-swagger - ${remi.version} - - - ai.remi.top.cloud - remi-comm-thread - ${remi.version} - - - ai.remi.top.cloud - remi-comm-util - ${remi.version} - - - ai.remi.top.cloud - remi-comm-auth - ${remi.version} - - - ai.remi.top.cloud - remi-comm-safe - ${remi.version} - - - ai.remi.top.cloud - remi-comm-web - ${remi.version} - - - - ai.remi.top.cloud - remi-sys - ${remi.version} - - - ai.remi.top.cloud - remi-sys-domain - ${remi.version} - - - ai.remi.top.cloud - remi-sys-infra - ${remi.version} - - - ai.remi.top.cloud - remi-sys-server - ${remi.version} - - - ai.remi.top.cloud - remi-sys-job - ${remi.version} - - - ai.remi.top.cloud - remi-sys-api - ${remi.version} - - - ai.remi.top.cloud - remi-sys-app - ${remi.version} - - - ai.remi.top.cloud - remi-sys-web - ${remi.version} - - - - - - - mybatis-plus-boot-starter - com.baomidou - ${mybatis-plus.version} - - - mybatis-plus-annotation - com.baomidou - ${mybatis-plus.version} - - - mybatis-plus-extension - com.baomidou - ${mybatis-plus.version} - - - - mybatis-spring-boot-starter - org.mybatis.spring.boot - ${mybatis.version} - - - - druid-spring-boot-starter - com.alibaba - ${druid.version} - - - - mysql - mysql-connector-java - ${mysql.version} - - - - com.oracle.database.jdbc - ojdbc8 - ${ojdbc.version} - - - com.oracle.database.nls - orai18n - ${ojdbc.version} - - - - com.microsoft.sqlserver - mssql-jdbc - ${mssql-jdbc.version} - - - - com.ibm.db2 - jcc - ${db2-jdbc.version} - - - - org.postgresql - postgresql - ${postgresql.version} - - - - com.h2database - h2 - ${h2.db.version} - - - - - - - org.apache.commons - commons-text - ${commons-text.version} - - - commons-io - commons-io - ${commons-io.version} - - - commons-lang3 - org.apache.commons - ${commons-lang3.version} - - - commons-codec - commons-codec - ${commons-codec.version} - - - commons-logging - commons-logging - ${commons-logging.version} - - - commons-net - commons-net - ${commons-net.version} - - - commons-collections - commons-collections - ${commons-collections.version} - - - commons-fileupload - commons-fileupload - ${commons-fileupload.version} - - - - commons-validator - commons-validator - ${commons-validator.version} - - - hibernate-validator - org.hibernate.validator - ${hibernate-validator.version} - - - hibernate-validator - org.hibernate - ${hibernate-validator.version} - - - - com.squareup.okhttp3 - okhttp - ${okhttp3.version} - - - com.squareup.okhttp3 - logging-interceptor - ${okhttp3.version} - - - - httpclient - org.apache.httpcomponents - ${httpclient.version} - - - - javax.servlet-api - javax.servlet - ${javax.version} - - - - device-detector - io.github.mngsk - ${device.version} - - - - guava - com.google.guava - ${guava.version} - - - - apm-toolkit-trace - org.apache.skywalking - ${trace.version} - - - - fastjson - com.alibaba - ${fastjson.version} - - - - jackson-core - com.fasterxml.jackson.core - ${jackson.version} - - - jackson-annotations - com.fasterxml.jackson.core - ${jackson.version} - - - jackson-databind - com.fasterxml.jackson.core - ${jackson.version} - - - - gson - com.google.code.gson - ${gson.version} - - - - eu.bitwalker - UserAgentUtils - ${bitwalker.version} - - - - org.lionsoul - ip2region - ${ip2region.version} - - - - cn.hutool - hutool-core - ${hutool.version} - - - cn.hutool - hutool-extra - ${hutool.version} - - - cn.hutool - hutool-http - ${hutool.version} - - - cn.hutool - hutool-json - ${hutool.version} - - - cn.hutool - hutool-crypto - ${hutool.version} - - - cn.hutool - hutool-all - ${hutool.version} - - - - dom4j - org.dom4j - ${dom4j.version} - - - - xxl-job-core - com.xuxueli - ${xxl-job.version} - - - - com.github.xiaoymin - knife4j-openapi3-spring-boot-starter - ${knife4j.version} - - - com.github.xiaoymin - knife4j-gateway-spring-boot-starter - ${knife4j.version} - - - - easyexcel - com.alibaba - ${easyexcel.version} - - - - minio - io.minio - ${minio.version} - - - - org.apache.velocity - velocity - ${velocity.version} - - - - jaxb-api - javax.xml.bind - ${jaxb-api.version} - - - - cglib - cglib - ${cglib.version} - + lombok @@ -605,40 +188,40 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ - - - - - - - - - - - - - + + + public + remi nexus + https://remi.njydsz.com/repository/remi-top + + true + + + true + + + - - - - - - - - - - - - - + + + public + remi nexus + https://remi.njydsz.com/repository/remi-top + + true + + + true + + + \ No newline at end of file diff --git a/remi-boot/pom.xml b/remi-boot/pom.xml new file mode 100644 index 0000000..dc5c4c3 --- /dev/null +++ b/remi-boot/pom.xml @@ -0,0 +1,229 @@ + + + 4.0.0 + ai.remi.top.boot + remi-boot + remi-boot + pom + 瑞米平台-单体聚合服务 + + + ai.remi.top.cloud + remi-cloud + 3.1.0 + + + + + 17 + ${java.version} + ${java.version} + + UTF-8 + UTF-8 + + + + remi-boot-domain + remi-boot-infra + remi-boot-server + remi-boot-job + remi-boot-app + remi-boot-api + remi-boot-web + + + + + + + spring-boot-dependencies + org.springframework.boot + import + pom + ${spring-boot.version} + + + + + spring-cloud-dependencies + org.springframework.cloud + import + pom + ${spring-cloud.version} + + + + + spring-cloud-alibaba-dependencies + com.alibaba.cloud + import + pom + ${spring-cloud-alibaba.version} + + + + + + remi-comm + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-core + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-redis + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-jdbc + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-domain + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-exception + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-feign + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-job + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-log + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-swagger + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-thread + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-util + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-auth + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-safe + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-web + ai.remi.top.comm + ${remi-comm.version} + + + + ai.remi.top.boot + remi-boot + ${remi-boot.version} + + + ai.remi.top.boot + remi-boot-domain + ${remi-boot.version} + + + ai.remi.top.boot + remi-boot-infra + ${remi-boot.version} + + + ai.remi.top.boot + remi-boot-server + ${remi-boot.version} + + + ai.remi.top.boot + remi-boot-job + ${remi-boot.version} + + + ai.remi.top.boot + remi-boot-api + ${remi-boot.version} + + + ai.remi.top.boot + remi-boot-app + ${remi-boot.version} + + + ai.remi.top.boot + remi-boot-web + ${remi-boot.version} + + + + + + + + + maven-releases + release + https://remi.njydsz.com/repository/remi-top-releases/ + + + maven-snapshots + snapshot + https://remi.njydsz.com/repository/remi-top-snapshots/ + + + + + + public + remi nexus + https://remi.njydsz.com/repository/remi-top + + true + + + true + + + + + + + public + remi nexus + https://remi.njydsz.com/repository/remi-top + + true + + + true + + + + diff --git a/remi-boot/remi-boot-api/pom.xml b/remi-boot/remi-boot-api/pom.xml new file mode 100644 index 0000000..a013025 --- /dev/null +++ b/remi-boot/remi-boot-api/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + remi-boot-api + remi-boot-api + remi-boot-api + + + ai.remi.top.boot + remi-boot + 3.1.0 + + + + + + ai.remi.top.comm + remi-comm-feign + + + + ai.remi.top.boot + remi-boot-domain + + + + javax.servlet + javax.servlet-api + + + + org.projectlombok + lombok + + + + + diff --git a/remi-boot/remi-boot-api/src/main/java/ai/remi/boot/api/client/IamClientApi.java b/remi-boot/remi-boot-api/src/main/java/ai/remi/boot/api/client/IamClientApi.java new file mode 100644 index 0000000..2453324 --- /dev/null +++ b/remi-boot/remi-boot-api/src/main/java/ai/remi/boot/api/client/IamClientApi.java @@ -0,0 +1,31 @@ +package ai.remi.boot.api.client; + +import ai.remi.comm.core.result.ResultBean; +import ai.remi.comm.feign.aspect.FeignAutoConfiguration; +import ai.remi.boot.api.factory.IamClientFactory; +import ai.remi.boot.domain.dto.post.LogRecordPostDTO; +import ai.remi.boot.domain.vo.ConfigVO; +import io.swagger.v3.oas.annotations.Operation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +@FeignClient(value = "remi-boot-web", configuration = FeignAutoConfiguration.class, fallbackFactory = IamClientFactory.class) +public interface IamClientApi { + + @Operation(summary = "保存日志") + @PostMapping("/logRecord/add") + ResultBean addLogRecord(@RequestBody @Validated LogRecordPostDTO logRecordDTO); + + @Operation(summary = "查询用户全局配置") + @PostMapping(value = "/config/getUserConfigs") + ResultBean> getUserConfigs(); + + @Operation(summary = "查询应用全局配置") + @PostMapping(value = "/config/getAppConfigs") + ResultBean> getAppConfigs(@RequestParam("appId") String appId, @RequestParam("confType") Integer confType); +} diff --git a/remi-boot/remi-boot-api/src/main/java/ai/remi/boot/api/factory/IamClientFactory.java b/remi-boot/remi-boot-api/src/main/java/ai/remi/boot/api/factory/IamClientFactory.java new file mode 100644 index 0000000..d9af04d --- /dev/null +++ b/remi-boot/remi-boot-api/src/main/java/ai/remi/boot/api/factory/IamClientFactory.java @@ -0,0 +1,18 @@ +package ai.remi.boot.api.factory; + +import ai.remi.boot.api.client.IamClientApi; +import ai.remi.boot.api.fallback.IamClientFallback; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +@Component +public class IamClientFactory implements FallbackFactory { + + @Override + public IamClientApi create(Throwable cause) { + IamClientFallback fallback = new IamClientFallback(); + fallback.setCause(cause); + return fallback; + } +} + diff --git a/remi-boot/remi-boot-api/src/main/java/ai/remi/boot/api/fallback/IamClientFallback.java b/remi-boot/remi-boot-api/src/main/java/ai/remi/boot/api/fallback/IamClientFallback.java new file mode 100644 index 0000000..f964a57 --- /dev/null +++ b/remi-boot/remi-boot-api/src/main/java/ai/remi/boot/api/fallback/IamClientFallback.java @@ -0,0 +1,35 @@ +package ai.remi.boot.api.fallback; + +import ai.remi.comm.core.result.ResultBean; +import ai.remi.boot.api.client.IamClientApi; +import ai.remi.boot.domain.dto.post.LogRecordPostDTO; +import ai.remi.boot.domain.vo.ConfigVO; +import lombok.Setter; +import lombok.extern.slf4j.Slf4j; + +import java.util.List; + +@Slf4j +public class IamClientFallback implements IamClientApi { + @Setter + private Throwable cause; + + @Override + public ResultBean addLogRecord(LogRecordPostDTO logRecordDTO) { + log.error("addLogRecord = {}", cause.getMessage()); + return null; + } + + @Override + public ResultBean> getUserConfigs() { + log.error("getUserConfigs = {}", cause.getMessage()); + return null; + } + + @Override + public ResultBean> getAppConfigs(String appId, Integer confType) { + log.error("getAppConfigs = {}", cause.getMessage()); + return null; + } + +} diff --git a/remi-sys/remi-sys-app/pom.xml b/remi-boot/remi-boot-app/pom.xml similarity index 76% rename from remi-sys/remi-sys-app/pom.xml rename to remi-boot/remi-boot-app/pom.xml index 4f519be..e99bfc1 100644 --- a/remi-sys/remi-sys-app/pom.xml +++ b/remi-boot/remi-boot-app/pom.xml @@ -2,30 +2,16 @@ 4.0.0 - remi-sys-app - remi-sys-app - remi-sys-app + remi-boot-app + remi-boot-app + remi-boot-app - ai.remi.top.cloud - remi-sys - 3.1.1 + ai.remi.top.boot + remi-boot + 3.1.0 - - - - maven-releases - release - https://repository.njydsz.com/repository/maven-releases/ - - - maven-snapshots - snapshot - https://repository.njydsz.com/repository/maven-snapshots/ - - - @@ -71,21 +57,20 @@ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-feign - - - ai.remi.top.cloud - remi-sys-job - - - ai.remi.top.cloud - remi-sys-server + ai.remi.top.boot + remi-boot-job + + ai.remi.top.boot + remi-boot-server + + org.slf4j diff --git a/remi-demo/remi-demo-app/src/main/java/ai/remi/demo/app/Application.java b/remi-boot/remi-boot-app/src/main/java/ai/remi/boot/app/Application.java similarity index 85% rename from remi-demo/remi-demo-app/src/main/java/ai/remi/demo/app/Application.java rename to remi-boot/remi-boot-app/src/main/java/ai/remi/boot/app/Application.java index 6ce78fb..2ca2cf8 100644 --- a/remi-demo/remi-demo-app/src/main/java/ai/remi/demo/app/Application.java +++ b/remi-boot/remi-boot-app/src/main/java/ai/remi/boot/app/Application.java @@ -1,4 +1,4 @@ -package ai.remi.demo.app; +package ai.remi.boot.app; import ai.remi.comm.feign.annotation.EnableRemiFeignClients; import org.springframework.boot.SpringApplication; @@ -8,7 +8,7 @@ import org.springframework.context.annotation.EnableMBeanExport; import org.springframework.jmx.support.RegistrationPolicy; import org.springframework.transaction.annotation.EnableTransactionManagement; -//@Enableremitem +//@Enablestartdistem //@EnableLogRecord @EnableDiscoveryClient @EnableRemiFeignClients @@ -22,7 +22,7 @@ public class Application { SpringApplication.run(Application.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ Remi Cloud App 启动成功 ლ(´ڡ`ლ)ﾞ "); + System.out.println("(♥◠‿◠)ﾉﾞ Remi IAM App 启动成功 ლ(´ڡ`ლ)ﾞ "); } diff --git a/remi-sys/remi-sys-app/src/main/resources/bootstrap.yml b/remi-boot/remi-boot-app/src/main/resources/bootstrap.yml similarity index 95% rename from remi-sys/remi-sys-app/src/main/resources/bootstrap.yml rename to remi-boot/remi-boot-app/src/main/resources/bootstrap.yml index 402d705..09fd552 100644 --- a/remi-sys/remi-sys-app/src/main/resources/bootstrap.yml +++ b/remi-boot/remi-boot-app/src/main/resources/bootstrap.yml @@ -1,10 +1,10 @@ # 服务端口号 server: - port: 1020 + port: 12801 spring: application: - name: remi-sys-app + name: remi-boot-app profiles: active: local cloud: @@ -12,7 +12,7 @@ spring: nacos: # 注册中心 username: nacos - password: Remi2022 + password: nacos discovery: # 配置中心的地址 server-addr: ${NACOS_HOST:192.168.1.31}:${NACOS_PORT:8848} diff --git a/remi-sys/remi-sys-app/src/main/resources/k8s/Dockerfile b/remi-boot/remi-boot-app/src/main/resources/docker/Dockerfile similarity index 81% rename from remi-sys/remi-sys-app/src/main/resources/k8s/Dockerfile rename to remi-boot/remi-boot-app/src/main/resources/docker/Dockerfile index b39ffea..9bb751e 100644 --- a/remi-sys/remi-sys-app/src/main/resources/k8s/Dockerfile +++ b/remi-boot/remi-boot-app/src/main/resources/docker/Dockerfile @@ -3,20 +3,22 @@ # Author: DianJiu # 指定基础镜像，这是分阶段构建的前期阶段 FROM harbor.njydsz.com/library/jdk:17 as builder +# 维护者 +MAINTAINER DianJiu #VOLUME：挂载目录 VOLUME /temp #ADD 将app.jar文件将拷贝到容器中，默认拷贝到根路径下 #也可以直接写成ADD app.jar /app.jar 或者 ADD app.jar / -ADD remi-sys-app-3.1.0.jar remi-sys-app.jar +ADD startdistem-web-1.0.0.jar startdistem-web.jar #修改app.jar这个文件的访问时间和修改时间为当前时间，而不会修改文件的内容。 -RUN bash -c "touch /remi-sys-app.jar" +RUN bash -c "touch /startdistem-web.jar" #ENTRYPOINT 应用启动命令 参数设定 #由于tomcat的session id的生成主要通过java.security.SecureRandom生成随机数来实现，导致启动过程很慢 #通过-Djava.security.egd=file:/dev/./urandom参数可以加快随机数产生过程 -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/remi-sys-app.jar"] +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/startdistem-web.jar"] #EXPOSE 容器暴露端口 -EXPOSE 1020 +EXPOSE 18080 diff --git a/remi-boot/remi-boot-app/src/main/resources/docker/README.md b/remi-boot/remi-boot-app/src/main/resources/docker/README.md new file mode 100644 index 0000000..5b2e1c7 --- /dev/null +++ b/remi-boot/remi-boot-app/src/main/resources/docker/README.md @@ -0,0 +1,5 @@ +```shell +sh ./docker_deploy.sh + +docker logs -f startdistem-web +``` \ No newline at end of file diff --git a/remi-boot/remi-boot-app/src/main/resources/docker/docker_deploy.sh b/remi-boot/remi-boot-app/src/main/resources/docker/docker_deploy.sh new file mode 100644 index 0000000..999d624 --- /dev/null +++ b/remi-boot/remi-boot-app/src/main/resources/docker/docker_deploy.sh @@ -0,0 +1,7 @@ +docker stop startdistem-web +docker rm -f startdistem-web +docker rmi startdistem-web +docker build -t startdistem-web . +docker images +docker run --restart=always -t -dit -p 18080:18080 -e TZ="Asia/Shanghai" --name startdistem-web startdistem-web +docker ps diff --git a/remi-sys/remi-sys-app/src/main/resources/logback-spring.xml b/remi-boot/remi-boot-app/src/main/resources/logback-spring.xml similarity index 100% rename from remi-sys/remi-sys-app/src/main/resources/logback-spring.xml rename to remi-boot/remi-boot-app/src/main/resources/logback-spring.xml diff --git a/remi-sys/remi-sys-domain/pom.xml b/remi-boot/remi-boot-domain/pom.xml similarity index 72% rename from remi-sys/remi-sys-domain/pom.xml rename to remi-boot/remi-boot-domain/pom.xml index 8a12cb6..1738195 100644 --- a/remi-sys/remi-sys-domain/pom.xml +++ b/remi-boot/remi-boot-domain/pom.xml @@ -2,39 +2,25 @@ 4.0.0 - remi-sys-domain - remi-sys-domain - remi-sys-domain + remi-boot-domain + remi-boot-domain + remi-boot-domain - ai.remi.top.cloud - remi-sys - 3.1.1 + ai.remi.top.boot + remi-boot + 3.1.0 - - - - maven-releases - release - https://repository.njydsz.com/repository/maven-releases/ - - - maven-snapshots - snapshot - https://repository.njydsz.com/repository/maven-snapshots/ - - - - ai.remi.top.cloud + ai.remi.top.comm remi-comm-domain - ai.remi.top.cloud + ai.remi.top.comm remi-comm-swagger diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/Cas3Constant.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/Cas3Constant.java similarity index 74% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/Cas3Constant.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/Cas3Constant.java index 7080024..3b8a3f8 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/Cas3Constant.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/Cas3Constant.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.constant; +package ai.remi.boot.domain.constant; /** * CAS (Central Authentication Service) diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/JwtConstant.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/JwtConstant.java similarity index 71% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/JwtConstant.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/JwtConstant.java index f3d7477..a044722 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/JwtConstant.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/JwtConstant.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.constant; +package ai.remi.boot.domain.constant; /** * JWT (Json web token) diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/Oauth2Constant.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/Oauth2Constant.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/Oauth2Constant.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/Oauth2Constant.java index 91c6867..d079212 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/Oauth2Constant.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/Oauth2Constant.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.constant; +package ai.remi.boot.domain.constant; /** * Oauth2 单点登录常量 diff --git a/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/OidcConstant.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/OidcConstant.java new file mode 100644 index 0000000..58caf11 --- /dev/null +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/OidcConstant.java @@ -0,0 +1,4 @@ +package ai.remi.boot.domain.constant; + +public class OidcConstant { +} diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/Saml2Constant.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/Saml2Constant.java similarity index 74% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/Saml2Constant.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/Saml2Constant.java index a9cbbec..2ae8fbe 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/Saml2Constant.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/Saml2Constant.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.constant; +package ai.remi.boot.domain.constant; /** * CAS (Central Authentication Service) diff --git a/remi-demo/remi-demo-domain/src/main/java/ai/remi/demo/domain/constant/SsoConstant.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/SsoConstant.java similarity index 94% rename from remi-demo/remi-demo-domain/src/main/java/ai/remi/demo/domain/constant/SsoConstant.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/SsoConstant.java index 7fedc84..838c408 100644 --- a/remi-demo/remi-demo-domain/src/main/java/ai/remi/demo/domain/constant/SsoConstant.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/constant/SsoConstant.java @@ -1,4 +1,4 @@ -package ai.remi.demo.domain.constant; +package ai.remi.boot.domain.constant; /** * 单点登录基础常量 diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AccessTokenConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AccessTokenConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AccessTokenConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AccessTokenConverter.java index 73912ec..46780fa 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AccessTokenConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AccessTokenConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.AccessTokenPostDTO; -import ai.remi.sys.domain.dto.put.AccessTokenPutDTO; -import ai.remi.sys.domain.entity.AccessToken; -import ai.remi.sys.domain.query.AccessTokenQuery; -import ai.remi.sys.domain.vo.AccessTokenVO; +import ai.remi.boot.domain.dto.post.AccessTokenPostDTO; +import ai.remi.boot.domain.dto.put.AccessTokenPutDTO; +import ai.remi.boot.domain.entity.AccessToken; +import ai.remi.boot.domain.query.AccessTokenQuery; +import ai.remi.boot.domain.vo.AccessTokenVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AppConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AppConverter.java similarity index 87% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AppConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AppConverter.java index 091c43d..ed70707 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AppConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AppConverter.java @@ -1,10 +1,10 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.AppPostDTO; -import ai.remi.sys.domain.dto.put.AppPutDTO; -import ai.remi.sys.domain.entity.App; -import ai.remi.sys.domain.query.AppQuery; -import ai.remi.sys.domain.vo.AppVO; +import ai.remi.boot.domain.dto.post.AppPostDTO; +import ai.remi.boot.domain.dto.put.AppPutDTO; +import ai.remi.boot.domain.entity.App; +import ai.remi.boot.domain.query.AppQuery; +import ai.remi.boot.domain.vo.AppVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AppGroupConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AppGroupConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AppGroupConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AppGroupConverter.java index 1359257..7d3bcbd 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AppGroupConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AppGroupConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.AppGroupPostDTO; -import ai.remi.sys.domain.dto.put.AppGroupPutDTO; -import ai.remi.sys.domain.entity.AppGroup; -import ai.remi.sys.domain.query.AppGroupQuery; -import ai.remi.sys.domain.vo.AppGroupVO; +import ai.remi.boot.domain.dto.post.AppGroupPostDTO; +import ai.remi.boot.domain.dto.put.AppGroupPutDTO; +import ai.remi.boot.domain.entity.AppGroup; +import ai.remi.boot.domain.query.AppGroupQuery; +import ai.remi.boot.domain.vo.AppGroupVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AppMenuConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AppMenuConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AppMenuConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AppMenuConverter.java index 694dfd8..34dcc9d 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AppMenuConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AppMenuConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.AppMenuPostDTO; -import ai.remi.sys.domain.dto.put.AppMenuPutDTO; -import ai.remi.sys.domain.entity.AppMenu; -import ai.remi.sys.domain.query.AppMenuQuery; -import ai.remi.sys.domain.vo.AppMenuVO; +import ai.remi.boot.domain.dto.post.AppMenuPostDTO; +import ai.remi.boot.domain.dto.put.AppMenuPutDTO; +import ai.remi.boot.domain.entity.AppMenu; +import ai.remi.boot.domain.query.AppMenuQuery; +import ai.remi.boot.domain.vo.AppMenuVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AppPublishConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AppPublishConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AppPublishConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AppPublishConverter.java index 9a4788f..db1f14f 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AppPublishConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AppPublishConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.AppPublishPostDTO; -import ai.remi.sys.domain.dto.put.AppPublishPutDTO; -import ai.remi.sys.domain.entity.AppPublish; -import ai.remi.sys.domain.query.AppPublishQuery; -import ai.remi.sys.domain.vo.AppPublishVO; +import ai.remi.boot.domain.dto.post.AppPublishPostDTO; +import ai.remi.boot.domain.dto.put.AppPublishPutDTO; +import ai.remi.boot.domain.entity.AppPublish; +import ai.remi.boot.domain.query.AppPublishQuery; +import ai.remi.boot.domain.vo.AppPublishVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AreaConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AreaConverter.java similarity index 87% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AreaConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AreaConverter.java index 3b01eff..7515c9b 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/AreaConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/AreaConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.AreaPostDTO; -import ai.remi.sys.domain.dto.put.AreaPutDTO; -import ai.remi.sys.domain.entity.Area; -import ai.remi.sys.domain.query.AreaQuery; -import ai.remi.sys.domain.vo.AreaVO; +import ai.remi.boot.domain.dto.post.AreaPostDTO; +import ai.remi.boot.domain.dto.put.AreaPutDTO; +import ai.remi.boot.domain.entity.Area; +import ai.remi.boot.domain.query.AreaQuery; +import ai.remi.boot.domain.vo.AreaVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/BucketConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/BucketConverter.java similarity index 87% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/BucketConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/BucketConverter.java index 10622e1..d4ba617 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/BucketConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/BucketConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.BucketPostDTO; -import ai.remi.sys.domain.dto.put.BucketPutDTO; -import ai.remi.sys.domain.entity.Bucket; -import ai.remi.sys.domain.query.BucketQuery; -import ai.remi.sys.domain.vo.BucketVO; +import ai.remi.boot.domain.dto.post.BucketPostDTO; +import ai.remi.boot.domain.dto.put.BucketPutDTO; +import ai.remi.boot.domain.entity.Bucket; +import ai.remi.boot.domain.query.BucketQuery; +import ai.remi.boot.domain.vo.BucketVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/CompanyConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/CompanyConverter.java similarity index 87% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/CompanyConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/CompanyConverter.java index db4262b..45dee00 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/CompanyConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/CompanyConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.CompanyPostDTO; -import ai.remi.sys.domain.dto.put.CompanyPutDTO; -import ai.remi.sys.domain.entity.Company; -import ai.remi.sys.domain.query.CompanyQuery; -import ai.remi.sys.domain.vo.CompanyVO; +import ai.remi.boot.domain.dto.post.CompanyPostDTO; +import ai.remi.boot.domain.dto.put.CompanyPutDTO; +import ai.remi.boot.domain.entity.Company; +import ai.remi.boot.domain.query.CompanyQuery; +import ai.remi.boot.domain.vo.CompanyVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/CompanyDeptConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/CompanyDeptConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/CompanyDeptConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/CompanyDeptConverter.java index f76830a..2051f61 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/CompanyDeptConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/CompanyDeptConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.CompanyDeptPostDTO; -import ai.remi.sys.domain.dto.put.CompanyDeptPutDTO; -import ai.remi.sys.domain.entity.CompanyDept; -import ai.remi.sys.domain.query.CompanyDeptQuery; -import ai.remi.sys.domain.vo.CompanyDeptVO; +import ai.remi.boot.domain.dto.post.CompanyDeptPostDTO; +import ai.remi.boot.domain.dto.put.CompanyDeptPutDTO; +import ai.remi.boot.domain.entity.CompanyDept; +import ai.remi.boot.domain.query.CompanyDeptQuery; +import ai.remi.boot.domain.vo.CompanyDeptVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/ConfigConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/ConfigConverter.java similarity index 87% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/ConfigConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/ConfigConverter.java index bedb73d..42f0d7b 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/ConfigConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/ConfigConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.ConfigPostDTO; -import ai.remi.sys.domain.dto.put.ConfigPutDTO; -import ai.remi.sys.domain.entity.Config; -import ai.remi.sys.domain.query.ConfigQuery; -import ai.remi.sys.domain.vo.ConfigVO; +import ai.remi.boot.domain.dto.post.ConfigPostDTO; +import ai.remi.boot.domain.dto.put.ConfigPutDTO; +import ai.remi.boot.domain.entity.Config; +import ai.remi.boot.domain.query.ConfigQuery; +import ai.remi.boot.domain.vo.ConfigVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/CordRoleConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/CordRoleConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/CordRoleConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/CordRoleConverter.java index 9f33697..2a52b94 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/CordRoleConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/CordRoleConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.CordRolePostDTO; -import ai.remi.sys.domain.dto.put.CordRolePutDTO; -import ai.remi.sys.domain.entity.CordRole; -import ai.remi.sys.domain.query.CordRoleQuery; -import ai.remi.sys.domain.vo.CordRoleVO; +import ai.remi.boot.domain.dto.post.CordRolePostDTO; +import ai.remi.boot.domain.dto.put.CordRolePutDTO; +import ai.remi.boot.domain.entity.CordRole; +import ai.remi.boot.domain.query.CordRoleQuery; +import ai.remi.boot.domain.vo.CordRoleVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/DeptConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/DeptConverter.java similarity index 87% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/DeptConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/DeptConverter.java index 950eaea..8ebaf9e 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/DeptConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/DeptConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.DeptPostDTO; -import ai.remi.sys.domain.dto.put.DeptPutDTO; -import ai.remi.sys.domain.entity.Dept; -import ai.remi.sys.domain.query.DeptQuery; -import ai.remi.sys.domain.vo.DeptVO; +import ai.remi.boot.domain.dto.post.DeptPostDTO; +import ai.remi.boot.domain.dto.put.DeptPutDTO; +import ai.remi.boot.domain.entity.Dept; +import ai.remi.boot.domain.query.DeptQuery; +import ai.remi.boot.domain.vo.DeptVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/DeptUserConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/DeptUserConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/DeptUserConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/DeptUserConverter.java index 0bd03ba..05b79c1 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/DeptUserConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/DeptUserConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.DeptUserPostDTO; -import ai.remi.sys.domain.dto.put.DeptUserPutDTO; -import ai.remi.sys.domain.entity.DeptUser; -import ai.remi.sys.domain.query.DeptUserQuery; -import ai.remi.sys.domain.vo.DeptUserVO; +import ai.remi.boot.domain.dto.post.DeptUserPostDTO; +import ai.remi.boot.domain.dto.put.DeptUserPutDTO; +import ai.remi.boot.domain.entity.DeptUser; +import ai.remi.boot.domain.query.DeptUserQuery; +import ai.remi.boot.domain.vo.DeptUserVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/DictConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/DictConverter.java similarity index 87% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/DictConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/DictConverter.java index fbfaad9..662dbd1 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/DictConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/DictConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.DictPostDTO; -import ai.remi.sys.domain.dto.put.DictPutDTO; -import ai.remi.sys.domain.entity.Dict; -import ai.remi.sys.domain.query.DictQuery; -import ai.remi.sys.domain.vo.DictVO; +import ai.remi.boot.domain.dto.post.DictPostDTO; +import ai.remi.boot.domain.dto.put.DictPutDTO; +import ai.remi.boot.domain.entity.Dict; +import ai.remi.boot.domain.query.DictQuery; +import ai.remi.boot.domain.vo.DictVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/DictItemConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/DictItemConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/DictItemConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/DictItemConverter.java index 17d5dbe..b72d192 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/DictItemConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/DictItemConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.DictItemPostDTO; -import ai.remi.sys.domain.dto.put.DictItemPutDTO; -import ai.remi.sys.domain.entity.DictItem; -import ai.remi.sys.domain.query.DictItemQuery; -import ai.remi.sys.domain.vo.DictItemVO; +import ai.remi.boot.domain.dto.post.DictItemPostDTO; +import ai.remi.boot.domain.dto.put.DictItemPutDTO; +import ai.remi.boot.domain.entity.DictItem; +import ai.remi.boot.domain.query.DictItemQuery; +import ai.remi.boot.domain.vo.DictItemVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/FileConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/FileConverter.java similarity index 87% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/FileConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/FileConverter.java index 6fcda9d..dba0b29 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/FileConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/FileConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.FilePostDTO; -import ai.remi.sys.domain.dto.put.FilePutDTO; -import ai.remi.sys.domain.entity.File; -import ai.remi.sys.domain.query.FileQuery; -import ai.remi.sys.domain.vo.FileVO; +import ai.remi.boot.domain.dto.post.FilePostDTO; +import ai.remi.boot.domain.dto.put.FilePutDTO; +import ai.remi.boot.domain.entity.File; +import ai.remi.boot.domain.query.FileQuery; +import ai.remi.boot.domain.vo.FileVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/GradeConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/GradeConverter.java similarity index 87% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/GradeConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/GradeConverter.java index e199a56..fe8fe3c 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/GradeConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/GradeConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.GradePostDTO; -import ai.remi.sys.domain.dto.put.GradePutDTO; -import ai.remi.sys.domain.entity.Grade; -import ai.remi.sys.domain.query.GradeQuery; -import ai.remi.sys.domain.vo.GradeVO; +import ai.remi.boot.domain.dto.post.GradePostDTO; +import ai.remi.boot.domain.dto.put.GradePutDTO; +import ai.remi.boot.domain.entity.Grade; +import ai.remi.boot.domain.query.GradeQuery; +import ai.remi.boot.domain.vo.GradeVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/GroupConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/GroupConverter.java similarity index 87% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/GroupConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/GroupConverter.java index a5dc690..f7a8e88 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/GroupConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/GroupConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.GroupPostDTO; -import ai.remi.sys.domain.dto.put.GroupPutDTO; -import ai.remi.sys.domain.entity.Group; -import ai.remi.sys.domain.query.GroupQuery; -import ai.remi.sys.domain.vo.GroupVO; +import ai.remi.boot.domain.dto.post.GroupPostDTO; +import ai.remi.boot.domain.dto.put.GroupPutDTO; +import ai.remi.boot.domain.entity.Group; +import ai.remi.boot.domain.query.GroupQuery; +import ai.remi.boot.domain.vo.GroupVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/GroupRoleConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/GroupRoleConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/GroupRoleConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/GroupRoleConverter.java index 54a2b5c..56ef2b5 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/GroupRoleConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/GroupRoleConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.GroupRolePostDTO; -import ai.remi.sys.domain.dto.put.GroupRolePutDTO; -import ai.remi.sys.domain.entity.GroupRole; -import ai.remi.sys.domain.query.GroupRoleQuery; -import ai.remi.sys.domain.vo.GroupRoleVO; +import ai.remi.boot.domain.dto.post.GroupRolePostDTO; +import ai.remi.boot.domain.dto.put.GroupRolePutDTO; +import ai.remi.boot.domain.entity.GroupRole; +import ai.remi.boot.domain.query.GroupRoleQuery; +import ai.remi.boot.domain.vo.GroupRoleVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/GroupUserConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/GroupUserConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/GroupUserConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/GroupUserConverter.java index 42c764b..d9ce895 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/GroupUserConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/GroupUserConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.GroupUserPostDTO; -import ai.remi.sys.domain.dto.put.GroupUserPutDTO; -import ai.remi.sys.domain.entity.GroupUser; -import ai.remi.sys.domain.query.GroupUserQuery; -import ai.remi.sys.domain.vo.GroupUserVO; +import ai.remi.boot.domain.dto.post.GroupUserPostDTO; +import ai.remi.boot.domain.dto.put.GroupUserPutDTO; +import ai.remi.boot.domain.entity.GroupUser; +import ai.remi.boot.domain.query.GroupUserQuery; +import ai.remi.boot.domain.vo.GroupUserVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/LogRecordConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/LogRecordConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/LogRecordConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/LogRecordConverter.java index e4582f2..38937bd 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/LogRecordConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/LogRecordConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.LogRecordPostDTO; -import ai.remi.sys.domain.dto.put.LogRecordPutDTO; -import ai.remi.sys.domain.entity.LogRecord; -import ai.remi.sys.domain.query.LogRecordQuery; -import ai.remi.sys.domain.vo.LogRecordVO; +import ai.remi.boot.domain.dto.post.LogRecordPostDTO; +import ai.remi.boot.domain.dto.put.LogRecordPutDTO; +import ai.remi.boot.domain.entity.LogRecord; +import ai.remi.boot.domain.query.LogRecordQuery; +import ai.remi.boot.domain.vo.LogRecordVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/MenuConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/MenuConverter.java similarity index 87% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/MenuConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/MenuConverter.java index 5a91252..ee00156 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/MenuConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/MenuConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.MenuPostDTO; -import ai.remi.sys.domain.dto.put.MenuPutDTO; -import ai.remi.sys.domain.entity.Menu; -import ai.remi.sys.domain.query.MenuQuery; -import ai.remi.sys.domain.vo.MenuVO; +import ai.remi.boot.domain.dto.post.MenuPostDTO; +import ai.remi.boot.domain.dto.put.MenuPutDTO; +import ai.remi.boot.domain.entity.Menu; +import ai.remi.boot.domain.query.MenuQuery; +import ai.remi.boot.domain.vo.MenuVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/NoticeConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/NoticeConverter.java similarity index 87% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/NoticeConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/NoticeConverter.java index 516489c..35418ba 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/NoticeConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/NoticeConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.NoticePostDTO; -import ai.remi.sys.domain.dto.put.NoticePutDTO; -import ai.remi.sys.domain.entity.Notice; -import ai.remi.sys.domain.query.NoticeQuery; -import ai.remi.sys.domain.vo.NoticeVO; +import ai.remi.boot.domain.dto.post.NoticePostDTO; +import ai.remi.boot.domain.dto.put.NoticePutDTO; +import ai.remi.boot.domain.entity.Notice; +import ai.remi.boot.domain.query.NoticeQuery; +import ai.remi.boot.domain.vo.NoticeVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/OauthCodeConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/OauthCodeConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/OauthCodeConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/OauthCodeConverter.java index 5fe0eaa..7faf7ea 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/OauthCodeConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/OauthCodeConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.OauthCodePostDTO; -import ai.remi.sys.domain.dto.put.OauthCodePutDTO; -import ai.remi.sys.domain.entity.OauthCode; -import ai.remi.sys.domain.query.OauthCodeQuery; -import ai.remi.sys.domain.vo.OauthCodeVO; +import ai.remi.boot.domain.dto.post.OauthCodePostDTO; +import ai.remi.boot.domain.dto.put.OauthCodePutDTO; +import ai.remi.boot.domain.entity.OauthCode; +import ai.remi.boot.domain.query.OauthCodeQuery; +import ai.remi.boot.domain.vo.OauthCodeVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/PositionConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/PositionConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/PositionConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/PositionConverter.java index a29e14c..42064d0 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/PositionConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/PositionConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.PositionPostDTO; -import ai.remi.sys.domain.dto.put.PositionPutDTO; -import ai.remi.sys.domain.entity.Position; -import ai.remi.sys.domain.query.PositionQuery; -import ai.remi.sys.domain.vo.PositionVO; +import ai.remi.boot.domain.dto.post.PositionPostDTO; +import ai.remi.boot.domain.dto.put.PositionPutDTO; +import ai.remi.boot.domain.entity.Position; +import ai.remi.boot.domain.query.PositionQuery; +import ai.remi.boot.domain.vo.PositionVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/PostRoleConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/PostRoleConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/PostRoleConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/PostRoleConverter.java index baa8cf8..4a63f6f 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/PostRoleConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/PostRoleConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.PostRolePostDTO; -import ai.remi.sys.domain.dto.put.PostRolePutDTO; -import ai.remi.sys.domain.entity.PostRole; -import ai.remi.sys.domain.query.PostRoleQuery; -import ai.remi.sys.domain.vo.PostRoleVO; +import ai.remi.boot.domain.dto.post.PostRolePostDTO; +import ai.remi.boot.domain.dto.put.PostRolePutDTO; +import ai.remi.boot.domain.entity.PostRole; +import ai.remi.boot.domain.query.PostRoleQuery; +import ai.remi.boot.domain.vo.PostRoleVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/RankConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/RankConverter.java similarity index 87% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/RankConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/RankConverter.java index 696e9cc..30ae070 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/RankConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/RankConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.RankPostDTO; -import ai.remi.sys.domain.dto.put.RankPutDTO; -import ai.remi.sys.domain.entity.Rank; -import ai.remi.sys.domain.query.RankQuery; -import ai.remi.sys.domain.vo.RankVO; +import ai.remi.boot.domain.dto.post.RankPostDTO; +import ai.remi.boot.domain.dto.put.RankPutDTO; +import ai.remi.boot.domain.entity.Rank; +import ai.remi.boot.domain.query.RankQuery; +import ai.remi.boot.domain.vo.RankVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/RefreshTokenConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/RefreshTokenConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/RefreshTokenConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/RefreshTokenConverter.java index 00cf80c..f25e698 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/RefreshTokenConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/RefreshTokenConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.RefreshTokenPostDTO; -import ai.remi.sys.domain.dto.put.RefreshTokenPutDTO; -import ai.remi.sys.domain.entity.RefreshToken; -import ai.remi.sys.domain.query.RefreshTokenQuery; -import ai.remi.sys.domain.vo.RefreshTokenVO; +import ai.remi.boot.domain.dto.post.RefreshTokenPostDTO; +import ai.remi.boot.domain.dto.put.RefreshTokenPutDTO; +import ai.remi.boot.domain.entity.RefreshToken; +import ai.remi.boot.domain.query.RefreshTokenQuery; +import ai.remi.boot.domain.vo.RefreshTokenVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/RestrictIpConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/RestrictIpConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/RestrictIpConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/RestrictIpConverter.java index 319b384..2e9ef49 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/RestrictIpConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/RestrictIpConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.RestrictIpPostDTO; -import ai.remi.sys.domain.dto.put.RestrictIpPutDTO; -import ai.remi.sys.domain.entity.RestrictIp; -import ai.remi.sys.domain.query.RestrictIpQuery; -import ai.remi.sys.domain.vo.RestrictIpVO; +import ai.remi.boot.domain.dto.post.RestrictIpPostDTO; +import ai.remi.boot.domain.dto.put.RestrictIpPutDTO; +import ai.remi.boot.domain.entity.RestrictIp; +import ai.remi.boot.domain.query.RestrictIpQuery; +import ai.remi.boot.domain.vo.RestrictIpVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/RoleConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/RoleConverter.java similarity index 87% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/RoleConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/RoleConverter.java index 9d41bb7..e54d185 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/RoleConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/RoleConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.RolePostDTO; -import ai.remi.sys.domain.dto.put.RolePutDTO; -import ai.remi.sys.domain.entity.Role; -import ai.remi.sys.domain.query.RoleQuery; -import ai.remi.sys.domain.vo.RoleVO; +import ai.remi.boot.domain.dto.post.RolePostDTO; +import ai.remi.boot.domain.dto.put.RolePutDTO; +import ai.remi.boot.domain.entity.Role; +import ai.remi.boot.domain.query.RoleQuery; +import ai.remi.boot.domain.vo.RoleVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/RoleMenuConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/RoleMenuConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/RoleMenuConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/RoleMenuConverter.java index f4bc637..8458717 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/RoleMenuConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/RoleMenuConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.RoleMenuPostDTO; -import ai.remi.sys.domain.dto.put.RoleMenuPutDTO; -import ai.remi.sys.domain.entity.RoleMenu; -import ai.remi.sys.domain.query.RoleMenuQuery; -import ai.remi.sys.domain.vo.RoleMenuVO; +import ai.remi.boot.domain.dto.post.RoleMenuPostDTO; +import ai.remi.boot.domain.dto.put.RoleMenuPutDTO; +import ai.remi.boot.domain.entity.RoleMenu; +import ai.remi.boot.domain.query.RoleMenuQuery; +import ai.remi.boot.domain.vo.RoleMenuVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/UserConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/UserConverter.java similarity index 87% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/UserConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/UserConverter.java index cee94ee..8ae102e 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/UserConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/UserConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.UserPostDTO; -import ai.remi.sys.domain.dto.put.UserPutDTO; -import ai.remi.sys.domain.entity.User; -import ai.remi.sys.domain.query.UserQuery; -import ai.remi.sys.domain.vo.UserVO; +import ai.remi.boot.domain.dto.post.UserPostDTO; +import ai.remi.boot.domain.dto.put.UserPutDTO; +import ai.remi.boot.domain.entity.User; +import ai.remi.boot.domain.query.UserQuery; +import ai.remi.boot.domain.vo.UserVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/UserPostConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/UserPostConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/UserPostConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/UserPostConverter.java index c5401b6..a17a04c 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/UserPostConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/UserPostConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.UserPostPostDTO; -import ai.remi.sys.domain.dto.put.UserPostPutDTO; -import ai.remi.sys.domain.entity.UserPost; -import ai.remi.sys.domain.query.UserPostQuery; -import ai.remi.sys.domain.vo.UserPostVO; +import ai.remi.boot.domain.dto.post.UserPostPostDTO; +import ai.remi.boot.domain.dto.put.UserPostPutDTO; +import ai.remi.boot.domain.entity.UserPost; +import ai.remi.boot.domain.query.UserPostQuery; +import ai.remi.boot.domain.vo.UserPostVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/UserRoleConverter.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/UserRoleConverter.java similarity index 86% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/UserRoleConverter.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/UserRoleConverter.java index 3c4263c..0635f42 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/converter/UserRoleConverter.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/converter/UserRoleConverter.java @@ -1,11 +1,11 @@ -package ai.remi.sys.domain.converter; +package ai.remi.boot.domain.converter; -import ai.remi.sys.domain.dto.post.UserRolePostDTO; -import ai.remi.sys.domain.dto.put.UserRolePutDTO; -import ai.remi.sys.domain.entity.UserRole; -import ai.remi.sys.domain.query.UserRoleQuery; -import ai.remi.sys.domain.vo.UserRoleVO; +import ai.remi.boot.domain.dto.post.UserRolePostDTO; +import ai.remi.boot.domain.dto.put.UserRolePutDTO; +import ai.remi.boot.domain.entity.UserRole; +import ai.remi.boot.domain.query.UserRoleQuery; +import ai.remi.boot.domain.vo.UserRoleVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AccessTokenPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AccessTokenPostDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AccessTokenPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AccessTokenPostDTO.java index 9ed86e3..c65a5ef 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AccessTokenPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AccessTokenPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AppGroupPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AppGroupPostDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AppGroupPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AppGroupPostDTO.java index 27e9ae3..b50f2a5 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AppGroupPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AppGroupPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AppMenuPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AppMenuPostDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AppMenuPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AppMenuPostDTO.java index 3967ae8..00ab27b 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AppMenuPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AppMenuPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AppPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AppPostDTO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AppPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AppPostDTO.java index f7ff864..c2e78fa 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AppPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AppPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AppPublishPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AppPublishPostDTO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AppPublishPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AppPublishPostDTO.java index e5e2ddb..360c3fb 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AppPublishPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AppPublishPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AreaPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AreaPostDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AreaPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AreaPostDTO.java index b7636b8..f460f5e 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/AreaPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/AreaPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/BucketPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/BucketPostDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/BucketPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/BucketPostDTO.java index 4160236..cc2632c 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/BucketPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/BucketPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/CompanyDeptPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/CompanyDeptPostDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/CompanyDeptPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/CompanyDeptPostDTO.java index f77fc2e..7175c22 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/CompanyDeptPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/CompanyDeptPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/CompanyPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/CompanyPostDTO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/CompanyPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/CompanyPostDTO.java index 69f721b..4ba57ca 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/CompanyPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/CompanyPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/ConfigPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/ConfigPostDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/ConfigPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/ConfigPostDTO.java index c926285..af331b7 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/ConfigPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/ConfigPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/CordRolePostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/CordRolePostDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/CordRolePostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/CordRolePostDTO.java index eac9639..d1782be 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/CordRolePostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/CordRolePostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/DeptPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/DeptPostDTO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/DeptPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/DeptPostDTO.java index 9ea1616..6ca74ce 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/DeptPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/DeptPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/DeptUserPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/DeptUserPostDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/DeptUserPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/DeptUserPostDTO.java index faa29fa..2468843 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/DeptUserPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/DeptUserPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/DictItemPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/DictItemPostDTO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/DictItemPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/DictItemPostDTO.java index f20f9e3..a5be052 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/DictItemPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/DictItemPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/DictPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/DictPostDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/DictPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/DictPostDTO.java index cfce15f..103bc29 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/DictPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/DictPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/FilePostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/FilePostDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/FilePostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/FilePostDTO.java index d9f7d8e..ea05e2b 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/FilePostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/FilePostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/GradePostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/GradePostDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/GradePostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/GradePostDTO.java index c1c6c76..efa1c85 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/GradePostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/GradePostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/GroupPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/GroupPostDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/GroupPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/GroupPostDTO.java index f49ac37..a3b4f40 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/GroupPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/GroupPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/GroupRolePostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/GroupRolePostDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/GroupRolePostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/GroupRolePostDTO.java index 6d75526..bf4d726 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/GroupRolePostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/GroupRolePostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/GroupUserPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/GroupUserPostDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/GroupUserPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/GroupUserPostDTO.java index 1eef937..91e7f38 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/GroupUserPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/GroupUserPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/LogRecordPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/LogRecordPostDTO.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/LogRecordPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/LogRecordPostDTO.java index 435383e..8960885 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/LogRecordPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/LogRecordPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/LoginPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/LoginPostDTO.java similarity index 95% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/LoginPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/LoginPostDTO.java index d03b710..b0650b7 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/LoginPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/LoginPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/MenuPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/MenuPostDTO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/MenuPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/MenuPostDTO.java index ffa3e5e..8fad8d7 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/MenuPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/MenuPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/NoticePostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/NoticePostDTO.java similarity index 90% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/NoticePostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/NoticePostDTO.java index cbae6d0..fb305e9 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/NoticePostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/NoticePostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; @@ -19,14 +19,14 @@ import java.math.BigDecimal; @ToString(callSuper = true) @Schema(description = "通知公告") public class NoticePostDTO implements Serializable { - private static final long serialVersionUID = -85705948237810052L; + private static final long serialVersionUID = 638388066835790215L; /** * 通知标题 */ @Schema(description = "通知标题") - private Integer noticeTitle; + private String noticeTitle; /** * 通知类型（1通知公告 2系统消息） diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/OauthCodePostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/OauthCodePostDTO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/OauthCodePostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/OauthCodePostDTO.java index 142a680..f5935ac 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/OauthCodePostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/OauthCodePostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/PositionPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/PositionPostDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/PositionPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/PositionPostDTO.java index 44fce94..dc26d25 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/PositionPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/PositionPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/PostRolePostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/PostRolePostDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/PostRolePostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/PostRolePostDTO.java index 2888ca7..984cccc 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/PostRolePostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/PostRolePostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/RankPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/RankPostDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/RankPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/RankPostDTO.java index 39d62a4..20dd794 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/RankPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/RankPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/RefreshTokenPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/RefreshTokenPostDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/RefreshTokenPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/RefreshTokenPostDTO.java index 7ef70e7..4ef6e57 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/RefreshTokenPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/RefreshTokenPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/RestrictIpPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/RestrictIpPostDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/RestrictIpPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/RestrictIpPostDTO.java index 0e66541..dd58384 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/RestrictIpPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/RestrictIpPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/RoleMenuPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/RoleMenuPostDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/RoleMenuPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/RoleMenuPostDTO.java index 436e491..73ef9eb 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/RoleMenuPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/RoleMenuPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/RolePostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/RolePostDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/RolePostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/RolePostDTO.java index 1c72db9..9c04d29 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/RolePostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/RolePostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/UserPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/UserPostDTO.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/UserPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/UserPostDTO.java index bf850f5..48435f6 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/UserPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/UserPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/UserPostPostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/UserPostPostDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/UserPostPostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/UserPostPostDTO.java index 982bc54..951ef14 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/UserPostPostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/UserPostPostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/UserRolePostDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/UserRolePostDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/UserRolePostDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/UserRolePostDTO.java index 0d663e0..4b2cd9e 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/post/UserRolePostDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/post/UserRolePostDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.post; +package ai.remi.boot.domain.dto.post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AccessTokenPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AccessTokenPutDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AccessTokenPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AccessTokenPutDTO.java index 67c1556..cd2f5b5 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AccessTokenPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AccessTokenPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AppGroupPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AppGroupPutDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AppGroupPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AppGroupPutDTO.java index 8baa61a..662caa7 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AppGroupPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AppGroupPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AppMenuPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AppMenuPutDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AppMenuPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AppMenuPutDTO.java index e0fd444..40f3f80 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AppMenuPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AppMenuPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AppPublishPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AppPublishPutDTO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AppPublishPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AppPublishPutDTO.java index 625582f..779c4d3 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AppPublishPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AppPublishPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AppPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AppPutDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AppPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AppPutDTO.java index 1d95ced..ff9039f 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AppPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AppPutDTO.java @@ -1,6 +1,6 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; -import ai.remi.sys.domain.dto.post.ConfigPostDTO; +import ai.remi.boot.domain.dto.post.ConfigPostDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AreaPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AreaPutDTO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AreaPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AreaPutDTO.java index fb0c7b8..81c171c 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/AreaPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/AreaPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/BucketPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/BucketPutDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/BucketPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/BucketPutDTO.java index a743cc2..c248d4f 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/BucketPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/BucketPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/CompanyDeptPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/CompanyDeptPutDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/CompanyDeptPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/CompanyDeptPutDTO.java index 484b646..69ad845 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/CompanyDeptPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/CompanyDeptPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/CompanyPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/CompanyPutDTO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/CompanyPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/CompanyPutDTO.java index 43dfae2..9929965 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/CompanyPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/CompanyPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/ConfigPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/ConfigPutDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/ConfigPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/ConfigPutDTO.java index 14c3e9f..951e032 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/ConfigPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/ConfigPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/CordRolePutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/CordRolePutDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/CordRolePutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/CordRolePutDTO.java index c50f824..525216a 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/CordRolePutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/CordRolePutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/DeptPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/DeptPutDTO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/DeptPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/DeptPutDTO.java index 71cceaf..da31295 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/DeptPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/DeptPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/DeptUserPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/DeptUserPutDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/DeptUserPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/DeptUserPutDTO.java index b679954..db5e319 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/DeptUserPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/DeptUserPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/DictItemPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/DictItemPutDTO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/DictItemPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/DictItemPutDTO.java index f504d2a..fe2f9f4 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/DictItemPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/DictItemPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/DictPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/DictPutDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/DictPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/DictPutDTO.java index df4d5fd..86d318f 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/DictPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/DictPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/FilePutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/FilePutDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/FilePutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/FilePutDTO.java index 0c68fde..242dfae 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/FilePutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/FilePutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/GradePutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/GradePutDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/GradePutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/GradePutDTO.java index bda8bec..fb7c5a2 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/GradePutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/GradePutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/GroupPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/GroupPutDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/GroupPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/GroupPutDTO.java index 68aab7c..490114f 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/GroupPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/GroupPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/GroupRolePutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/GroupRolePutDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/GroupRolePutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/GroupRolePutDTO.java index 5f7444c..fe35e22 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/GroupRolePutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/GroupRolePutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/GroupUserPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/GroupUserPutDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/GroupUserPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/GroupUserPutDTO.java index 8270f04..9fde294 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/GroupUserPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/GroupUserPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/LogRecordPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/LogRecordPutDTO.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/LogRecordPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/LogRecordPutDTO.java index aa9e001..72a3c8b 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/LogRecordPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/LogRecordPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/MenuPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/MenuPutDTO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/MenuPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/MenuPutDTO.java index 43d4b09..63db843 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/MenuPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/MenuPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/NoticePutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/NoticePutDTO.java similarity index 90% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/NoticePutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/NoticePutDTO.java index c871612..89c0246 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/NoticePutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/NoticePutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; @@ -19,7 +19,7 @@ import java.math.BigDecimal; @ToString(callSuper = true) @Schema(description = "通知公告") public class NoticePutDTO implements Serializable { - private static final long serialVersionUID = -60057424548731388L; + private static final long serialVersionUID = -94680158265505792L; /** * ID @@ -31,7 +31,7 @@ public class NoticePutDTO implements Serializable { * 通知标题 */ @Schema(description = "通知标题") - private Integer noticeTitle; + private String noticeTitle; /** * 通知类型（1通知公告 2系统消息） diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/OauthCodePutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/OauthCodePutDTO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/OauthCodePutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/OauthCodePutDTO.java index e078e1a..e348244 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/OauthCodePutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/OauthCodePutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/PositionPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/PositionPutDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/PositionPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/PositionPutDTO.java index 9861fd2..1928fce 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/PositionPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/PositionPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/PostRolePutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/PostRolePutDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/PostRolePutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/PostRolePutDTO.java index f328b11..3791ce1 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/PostRolePutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/PostRolePutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/RankPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/RankPutDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/RankPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/RankPutDTO.java index eb08bef..3279de4 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/RankPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/RankPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/RefreshTokenPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/RefreshTokenPutDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/RefreshTokenPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/RefreshTokenPutDTO.java index 9c93725..e3cdf4e 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/RefreshTokenPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/RefreshTokenPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/RestrictIpPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/RestrictIpPutDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/RestrictIpPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/RestrictIpPutDTO.java index feee8bb..802dcf1 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/RestrictIpPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/RestrictIpPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/RoleMenuPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/RoleMenuPutDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/RoleMenuPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/RoleMenuPutDTO.java index b6ccb45..338f879 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/RoleMenuPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/RoleMenuPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/RolePutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/RolePutDTO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/RolePutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/RolePutDTO.java index 936108c..66bd0cf 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/RolePutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/RolePutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/UserPostPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/UserPostPutDTO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/UserPostPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/UserPostPutDTO.java index d35cad5..6402d54 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/UserPostPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/UserPostPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/UserPutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/UserPutDTO.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/UserPutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/UserPutDTO.java index 10a9f42..68f44c8 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/UserPutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/UserPutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/UserRolePutDTO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/UserRolePutDTO.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/UserRolePutDTO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/UserRolePutDTO.java index 3dfe943..1cdda41 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/dto/put/UserRolePutDTO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/dto/put/UserRolePutDTO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.dto.put; +package ai.remi.boot.domain.dto.put; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/AccessToken.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/AccessToken.java similarity index 93% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/AccessToken.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/AccessToken.java index 56e1977..cf60b36 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/AccessToken.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/AccessToken.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -19,7 +19,7 @@ import java.time.LocalDateTime; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_access_token") +@TableName("remi_access_token") public class AccessToken extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/App.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/App.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/App.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/App.java index 42486e1..a7609b0 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/App.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/App.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_app") +@TableName("remi_app") public class App extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/AppGroup.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/AppGroup.java similarity index 92% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/AppGroup.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/AppGroup.java index 518bf1f..18a73db 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/AppGroup.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/AppGroup.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_app_group") +@TableName("remi_app_group") public class AppGroup extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/AppMenu.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/AppMenu.java similarity index 92% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/AppMenu.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/AppMenu.java index 2cf6117..5c6f540 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/AppMenu.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/AppMenu.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_app_menu") +@TableName("remi_app_menu") public class AppMenu extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/AppPublish.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/AppPublish.java similarity index 95% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/AppPublish.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/AppPublish.java index 6a21a23..9d9656c 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/AppPublish.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/AppPublish.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -19,7 +19,7 @@ import java.time.LocalDateTime; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_app_publish") +@TableName("remi_app_publish") public class AppPublish extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Area.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Area.java similarity index 95% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Area.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Area.java index 837863c..4f6c8d4 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Area.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Area.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_area") +@TableName("remi_area") public class Area extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Bucket.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Bucket.java similarity index 94% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Bucket.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Bucket.java index a36b0da..d4d4d8f 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Bucket.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Bucket.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_bucket") +@TableName("remi_bucket") public class Bucket extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Company.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Company.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Company.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Company.java index 0b53c9b..12357a4 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Company.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Company.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_company") +@TableName("remi_company") public class Company extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/CompanyDept.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/CompanyDept.java similarity index 92% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/CompanyDept.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/CompanyDept.java index 94b5d7b..14aa018 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/CompanyDept.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/CompanyDept.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_company_dept") +@TableName("remi_company_dept") public class CompanyDept extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Config.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Config.java similarity index 94% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Config.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Config.java index 85688c7..f2e5129 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Config.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Config.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_config") +@TableName("remi_config") public class Config extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/CordRole.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/CordRole.java similarity index 93% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/CordRole.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/CordRole.java index 0549b50..061c248 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/CordRole.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/CordRole.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_cord_role") +@TableName("remi_cord_role") public class CordRole extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Dept.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Dept.java similarity index 95% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Dept.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Dept.java index 8ef4177..39af66a 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Dept.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Dept.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_dept") +@TableName("remi_dept") public class Dept extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/DeptUser.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/DeptUser.java similarity index 92% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/DeptUser.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/DeptUser.java index 21131e3..710f04c 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/DeptUser.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/DeptUser.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_dept_user") +@TableName("remi_dept_user") public class DeptUser extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Dict.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Dict.java similarity index 93% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Dict.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Dict.java index ca55d46..22969f2 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Dict.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Dict.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_dict") +@TableName("remi_dict") public class Dict extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/DictItem.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/DictItem.java similarity index 95% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/DictItem.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/DictItem.java index b4d7e68..0d7eb02 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/DictItem.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/DictItem.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_dict_item") +@TableName("remi_dict_item") public class DictItem extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/File.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/File.java similarity index 94% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/File.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/File.java index d8d9034..361749c 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/File.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/File.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_file") +@TableName("remi_file") public class File extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Grade.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Grade.java similarity index 93% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Grade.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Grade.java index 1983119..d97bc6a 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Grade.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Grade.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_grade") +@TableName("remi_grade") public class Grade extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Group.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Group.java similarity index 94% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Group.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Group.java index bfe3eed..eca01b4 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Group.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Group.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_group") +@TableName("remi_group") public class Group extends BaseEntity { /** diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/GroupRole.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/GroupRole.java similarity index 92% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/GroupRole.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/GroupRole.java index a54caec..1c5f5de 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/GroupRole.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/GroupRole.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_group_role") +@TableName("remi_group_role") public class GroupRole extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/GroupUser.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/GroupUser.java similarity index 92% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/GroupUser.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/GroupUser.java index 1e17cfb..0b20141 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/GroupUser.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/GroupUser.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_group_user") +@TableName("remi_group_user") public class GroupUser extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/LogRecord.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/LogRecord.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/LogRecord.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/LogRecord.java index 45b77f6..2a03753 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/LogRecord.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/LogRecord.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -19,7 +19,7 @@ import java.time.LocalDateTime; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_log_record") +@TableName("remi_log_record") public class LogRecord extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Menu.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Menu.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Menu.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Menu.java index 9ae8879..bac4ace 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Menu.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Menu.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_menu") +@TableName("remi_menu") public class Menu extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Notice.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Notice.java similarity index 90% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Notice.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Notice.java index 9b7517a..f812824 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Notice.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Notice.java @@ -1,4 +1,5 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; + import ai.remi.comm.domain.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; @@ -16,13 +17,14 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_notice") +@TableName("remi_notice") public class Notice extends BaseEntity { + /** * 通知标题 */ - private Integer noticeTitle; + private String noticeTitle; /** * 通知类型（1通知公告 2系统消息） diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/OauthCode.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/OauthCode.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/OauthCode.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/OauthCode.java index 8c9efab..be60afc 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/OauthCode.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/OauthCode.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -20,7 +20,7 @@ import java.time.LocalDateTime; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_oauth_code") +@TableName("remi_oauth_code") public class OauthCode extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Position.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Position.java similarity index 94% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Position.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Position.java index 2a77239..d663ecd 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Position.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Position.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_position") +@TableName("remi_position") public class Position extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/PostRole.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/PostRole.java similarity index 92% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/PostRole.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/PostRole.java index df7b840..e0aca5b 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/PostRole.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/PostRole.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_post_role") +@TableName("remi_post_role") public class PostRole extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Rank.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Rank.java similarity index 94% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Rank.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Rank.java index dce0814..62831dc 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Rank.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Rank.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_rank") +@TableName("remi_rank") public class Rank extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/RefreshToken.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/RefreshToken.java similarity index 93% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/RefreshToken.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/RefreshToken.java index ce8ed02..3f33bf8 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/RefreshToken.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/RefreshToken.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -19,7 +19,7 @@ import java.time.LocalDateTime; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_refresh_token") +@TableName("remi_refresh_token") public class RefreshToken extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/RestrictIp.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/RestrictIp.java similarity index 92% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/RestrictIp.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/RestrictIp.java index e6e64e8..bb513f9 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/RestrictIp.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/RestrictIp.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_restrict_ip") +@TableName("remi_restrict_ip") public class RestrictIp extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Role.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Role.java similarity index 95% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Role.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Role.java index 839d2d7..8858ea2 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/Role.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/Role.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_role") +@TableName("remi_role") public class Role extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/RoleMenu.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/RoleMenu.java similarity index 92% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/RoleMenu.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/RoleMenu.java index dbe0e1c..81eca86 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/RoleMenu.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/RoleMenu.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_role_menu") +@TableName("remi_role_menu") public class RoleMenu extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/User.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/User.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/User.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/User.java index 170237c..834422f 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/User.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/User.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -20,7 +20,7 @@ import java.time.LocalDateTime; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_user") +@TableName("remi_user") public class User extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/UserPost.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/UserPost.java similarity index 93% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/UserPost.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/UserPost.java index 5038f0c..dffe073 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/UserPost.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/UserPost.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; import ai.remi.comm.domain.entity.BaseEntity; @@ -16,7 +16,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_user_post") +@TableName("remi_user_post") public class UserPost extends BaseEntity { /** diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/UserRole.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/UserRole.java similarity index 92% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/UserRole.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/UserRole.java index 84e07f3..1cd210c 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/entity/UserRole.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/entity/UserRole.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.entity; +package ai.remi.boot.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +17,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName("sys_user_role") +@TableName("remi_user_role") public class UserRole extends BaseEntity { diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/enums/Oauth2TypeEnum.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/enums/Oauth2TypeEnum.java similarity index 89% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/enums/Oauth2TypeEnum.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/enums/Oauth2TypeEnum.java index 6dabbbc..fd4d795 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/enums/Oauth2TypeEnum.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/enums/Oauth2TypeEnum.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.enums; +package ai.remi.boot.domain.enums; /** * Oauth2授权方式 diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/enums/RedisKeyEnum.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/enums/RedisKeyEnum.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/enums/RedisKeyEnum.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/enums/RedisKeyEnum.java index ceddbca..84ac73e 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/enums/RedisKeyEnum.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/enums/RedisKeyEnum.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.enums; +package ai.remi.boot.domain.enums; import cn.hutool.core.util.StrUtil; import lombok.AllArgsConstructor; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AccessTokenQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AccessTokenQuery.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AccessTokenQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AccessTokenQuery.java index f49bda7..2e7c3a7 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AccessTokenQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AccessTokenQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AppGroupQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AppGroupQuery.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AppGroupQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AppGroupQuery.java index c049a3a..eef0c8d 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AppGroupQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AppGroupQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AppMenuQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AppMenuQuery.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AppMenuQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AppMenuQuery.java index feb7350..3fa4817 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AppMenuQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AppMenuQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AppPublishQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AppPublishQuery.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AppPublishQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AppPublishQuery.java index d29da82..e0edb98 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AppPublishQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AppPublishQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AppQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AppQuery.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AppQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AppQuery.java index dd5f2a4..b121344 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AppQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AppQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AreaQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AreaQuery.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AreaQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AreaQuery.java index 9f58046..65a420a 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/AreaQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/AreaQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/BucketQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/BucketQuery.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/BucketQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/BucketQuery.java index 9a17633..28b1bd2 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/BucketQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/BucketQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/CompanyDeptQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/CompanyDeptQuery.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/CompanyDeptQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/CompanyDeptQuery.java index bcf9092..a7b05dd 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/CompanyDeptQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/CompanyDeptQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/CompanyQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/CompanyQuery.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/CompanyQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/CompanyQuery.java index afbc29b..e456cb9 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/CompanyQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/CompanyQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/ConfigQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/ConfigQuery.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/ConfigQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/ConfigQuery.java index a218f92..f0f4b4b 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/ConfigQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/ConfigQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/CordRoleQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/CordRoleQuery.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/CordRoleQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/CordRoleQuery.java index 3b8c4db..cc07895 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/CordRoleQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/CordRoleQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/DeptQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/DeptQuery.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/DeptQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/DeptQuery.java index df1e49f..1838f27 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/DeptQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/DeptQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/DeptUserQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/DeptUserQuery.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/DeptUserQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/DeptUserQuery.java index 7cdd32c..ec0f3fe 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/DeptUserQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/DeptUserQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/DictItemQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/DictItemQuery.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/DictItemQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/DictItemQuery.java index 1087238..9a939f3 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/DictItemQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/DictItemQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/DictQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/DictQuery.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/DictQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/DictQuery.java index f72f0e1..7ef0a15 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/DictQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/DictQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/FileQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/FileQuery.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/FileQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/FileQuery.java index 9dd63fc..7224912 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/FileQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/FileQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/GradeQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/GradeQuery.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/GradeQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/GradeQuery.java index 66cdf62..830b5b4 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/GradeQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/GradeQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/GroupQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/GroupQuery.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/GroupQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/GroupQuery.java index e8f24f3..c496574 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/GroupQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/GroupQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/GroupRoleQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/GroupRoleQuery.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/GroupRoleQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/GroupRoleQuery.java index 3a62297..c0f4c39 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/GroupRoleQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/GroupRoleQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/GroupUserQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/GroupUserQuery.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/GroupUserQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/GroupUserQuery.java index 08feef1..c837186 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/GroupUserQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/GroupUserQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/LogRecordQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/LogRecordQuery.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/LogRecordQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/LogRecordQuery.java index 92bf86a..111b7a9 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/LogRecordQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/LogRecordQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/MenuQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/MenuQuery.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/MenuQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/MenuQuery.java index e0c5e24..15203b5 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/MenuQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/MenuQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/NoticeQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/NoticeQuery.java similarity index 90% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/NoticeQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/NoticeQuery.java index fb717ce..f292489 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/NoticeQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/NoticeQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; @@ -19,7 +19,7 @@ import java.math.BigDecimal; @ToString(callSuper = true) @Schema(description = "通知公告") public class NoticeQuery implements Serializable { - private static final long serialVersionUID = 184487597326354695L; + private static final long serialVersionUID = -74961028239396885L; /** * ID */ @@ -29,8 +29,7 @@ public class NoticeQuery implements Serializable { * 通知标题 */ @Schema(description = "通知标题") - private Integer noticeTitle; - + private String noticeTitle; /** * 通知类型（1通知公告 2系统消息） */ diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/OauthCodeQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/OauthCodeQuery.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/OauthCodeQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/OauthCodeQuery.java index b840cc6..882478f 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/OauthCodeQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/OauthCodeQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/PositionQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/PositionQuery.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/PositionQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/PositionQuery.java index 060823e..626dad3 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/PositionQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/PositionQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/PostRoleQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/PostRoleQuery.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/PostRoleQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/PostRoleQuery.java index 9e3dbb8..3e43761 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/PostRoleQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/PostRoleQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/RankQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/RankQuery.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/RankQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/RankQuery.java index 8db95bd..7649c4e 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/RankQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/RankQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/RefreshTokenQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/RefreshTokenQuery.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/RefreshTokenQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/RefreshTokenQuery.java index 4df0275..e36e6b3 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/RefreshTokenQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/RefreshTokenQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/RestrictIpQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/RestrictIpQuery.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/RestrictIpQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/RestrictIpQuery.java index 53db9d9..6e147b2 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/RestrictIpQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/RestrictIpQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/RoleMenuQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/RoleMenuQuery.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/RoleMenuQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/RoleMenuQuery.java index 83264e2..c08f762 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/RoleMenuQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/RoleMenuQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/RoleQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/RoleQuery.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/RoleQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/RoleQuery.java index f53a2c4..6cbdc80 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/RoleQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/RoleQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/UserPostQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/UserPostQuery.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/UserPostQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/UserPostQuery.java index bb8d5ef..58466cf 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/UserPostQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/UserPostQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/UserQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/UserQuery.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/UserQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/UserQuery.java index 4b0e538..c4b8279 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/UserQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/UserQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/UserRoleQuery.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/UserRoleQuery.java similarity index 96% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/UserRoleQuery.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/UserRoleQuery.java index b15bddb..7471b5c 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/query/UserRoleQuery.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/query/UserRoleQuery.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.query; +package ai.remi.boot.domain.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/tree/CompanyTree.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/tree/CompanyTree.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/tree/CompanyTree.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/tree/CompanyTree.java index 5a90caa..311df49 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/tree/CompanyTree.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/tree/CompanyTree.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.tree; +package ai.remi.boot.domain.tree; import com.fasterxml.jackson.annotation.JsonFormat; import ai.remi.comm.domain.tree.TreeNode; @@ -15,7 +15,7 @@ import java.time.LocalDateTime; /** * @author Remi - * @email remi@dianjiukeji.cn + * @email startdis@dianjiukeji.cn * @desc 公司表 CompanyVO对象 */ @Data diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/tree/DeptTree.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/tree/DeptTree.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/tree/DeptTree.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/tree/DeptTree.java index cac0c91..8863083 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/tree/DeptTree.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/tree/DeptTree.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.tree; +package ai.remi.boot.domain.tree; import com.fasterxml.jackson.annotation.JsonFormat; import ai.remi.comm.domain.tree.TreeNode; @@ -15,7 +15,7 @@ import java.time.LocalDateTime; /** * @author Remi - * @email remi@dianjiukeji.cn + * @email startdis@dianjiukeji.cn * @desc 部门表 DeptVO对象 */ @Data diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/tree/GroupTree.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/tree/GroupTree.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/tree/GroupTree.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/tree/GroupTree.java index a8e27fa..3fa4aaa 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/tree/GroupTree.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/tree/GroupTree.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.tree; +package ai.remi.boot.domain.tree; import com.fasterxml.jackson.annotation.JsonFormat; import ai.remi.comm.domain.tree.TreeNode; @@ -15,7 +15,7 @@ import java.time.LocalDateTime; /** * @author Remi - * @email remi@dianjiukeji.cn + * @email startdis@dianjiukeji.cn * @desc 部门表 DeptVO对象 */ @Data diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/tree/MenuTree.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/tree/MenuTree.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/tree/MenuTree.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/tree/MenuTree.java index 4b2acf4..44276f6 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/tree/MenuTree.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/tree/MenuTree.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.tree; +package ai.remi.boot.domain.tree; import com.fasterxml.jackson.annotation.JsonFormat; import ai.remi.comm.domain.tree.TreeNode; @@ -15,7 +15,7 @@ import java.time.LocalDateTime; /** * @author Remi - * @email remi@dianjiukeji.cn + * @email startdis@dianjiukeji.cn * @desc 菜单表 MenuVO对象 */ @Data diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AccessTokenVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AccessTokenVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AccessTokenVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AccessTokenVO.java index 4d72139..1ad8d2b 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AccessTokenVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AccessTokenVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AppGroupVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AppGroupVO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AppGroupVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AppGroupVO.java index c323a31..f290823 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AppGroupVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AppGroupVO.java @@ -1,7 +1,7 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import ai.remi.sys.domain.tree.GroupTree; +import ai.remi.boot.domain.tree.GroupTree; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import org.springframework.format.annotation.DateTimeFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AppMenuVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AppMenuVO.java similarity index 97% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AppMenuVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AppMenuVO.java index e4318b8..f28ccf4 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AppMenuVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AppMenuVO.java @@ -1,7 +1,7 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import ai.remi.sys.domain.tree.MenuTree; +import ai.remi.boot.domain.tree.MenuTree; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import org.springframework.format.annotation.DateTimeFormat; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AppPublishVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AppPublishVO.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AppPublishVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AppPublishVO.java index 9402106..c929fcd 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AppPublishVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AppPublishVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AppVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AppVO.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AppVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AppVO.java index b36b00d..b6c07a3 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AppVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AppVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AreaVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AreaVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AreaVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AreaVO.java index 9fe2c44..b3fd760 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/AreaVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/AreaVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/BucketVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/BucketVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/BucketVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/BucketVO.java index 6eee998..fbd3352 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/BucketVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/BucketVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/CompanyDeptVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/CompanyDeptVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/CompanyDeptVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/CompanyDeptVO.java index 97208e4..eb4c0ea 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/CompanyDeptVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/CompanyDeptVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/CompanyVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/CompanyVO.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/CompanyVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/CompanyVO.java index d9c8bd5..81ac6fd 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/CompanyVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/CompanyVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/ConfigVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/ConfigVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/ConfigVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/ConfigVO.java index 4ca5bf9..d100588 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/ConfigVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/ConfigVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import java.time.LocalDateTime; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/CordRoleVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/CordRoleVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/CordRoleVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/CordRoleVO.java index a37d10a..bc6ec49 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/CordRoleVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/CordRoleVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/DeptUserVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/DeptUserVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/DeptUserVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/DeptUserVO.java index 146b0d4..14be61d 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/DeptUserVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/DeptUserVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/DeptVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/DeptVO.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/DeptVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/DeptVO.java index bf5b52e..df304ef 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/DeptVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/DeptVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/DictItemVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/DictItemVO.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/DictItemVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/DictItemVO.java index 294d1d2..6933bd6 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/DictItemVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/DictItemVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/DictVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/DictVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/DictVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/DictVO.java index badd021..8f2303d 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/DictVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/DictVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/FileVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/FileVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/FileVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/FileVO.java index 2a40787..b154c3b 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/FileVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/FileVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/GradeVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/GradeVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/GradeVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/GradeVO.java index bfa1b39..6caf9bc 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/GradeVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/GradeVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/GroupRoleVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/GroupRoleVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/GroupRoleVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/GroupRoleVO.java index 70c0ada..a983d31 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/GroupRoleVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/GroupRoleVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/GroupUserVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/GroupUserVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/GroupUserVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/GroupUserVO.java index e2e86ba..8694471 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/GroupUserVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/GroupUserVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/GroupVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/GroupVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/GroupVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/GroupVO.java index 7ad5b54..5002898 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/GroupVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/GroupVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/LogRecordVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/LogRecordVO.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/LogRecordVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/LogRecordVO.java index 83094e8..c47ae53 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/LogRecordVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/LogRecordVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/MenuVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/MenuVO.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/MenuVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/MenuVO.java index 910cf4c..b63f18c 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/MenuVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/MenuVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/NoticeVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/NoticeVO.java similarity index 95% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/NoticeVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/NoticeVO.java index d27c4f8..8aba1ff 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/NoticeVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/NoticeVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import java.time.LocalDateTime; @@ -23,7 +23,7 @@ import java.time.LocalDateTime; @ToString(callSuper = true) @Schema(description = "通知公告") public class NoticeVO implements Serializable { - private static final long serialVersionUID = 695350673723880666L; + private static final long serialVersionUID = 241220840441831277L; /** * ID */ @@ -33,8 +33,7 @@ public class NoticeVO implements Serializable { * 通知标题 */ @Schema(description = "通知标题") - private Integer noticeTitle; - + private String noticeTitle; /** * 通知类型（1通知公告 2系统消息） */ diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/OauthCodeVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/OauthCodeVO.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/OauthCodeVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/OauthCodeVO.java index d7879b1..95e7027 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/OauthCodeVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/OauthCodeVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/PositionVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/PositionVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/PositionVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/PositionVO.java index 74d53b4..1682a90 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/PositionVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/PositionVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/PostRoleVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/PostRoleVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/PostRoleVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/PostRoleVO.java index de754c8..b2ad55c 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/PostRoleVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/PostRoleVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/RankVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/RankVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/RankVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/RankVO.java index 676b953..84f6916 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/RankVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/RankVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/RefreshTokenVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/RefreshTokenVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/RefreshTokenVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/RefreshTokenVO.java index 08c408b..4b93932 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/RefreshTokenVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/RefreshTokenVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/RestrictIpVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/RestrictIpVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/RestrictIpVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/RestrictIpVO.java index ff3f2f9..36ba7a8 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/RestrictIpVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/RestrictIpVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/RoleMenuVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/RoleMenuVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/RoleMenuVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/RoleMenuVO.java index 6443410..39415e9 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/RoleMenuVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/RoleMenuVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/RoleVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/RoleVO.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/RoleVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/RoleVO.java index 5f303bf..f83f6e5 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/RoleVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/RoleVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/UserPostVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/UserPostVO.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/UserPostVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/UserPostVO.java index 3024310..50a5d32 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/UserPostVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/UserPostVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/UserRoleVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/UserRoleVO.java similarity index 98% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/UserRoleVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/UserRoleVO.java index d6e3c77..5eef6ef 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/UserRoleVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/UserRoleVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/UserVO.java b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/UserVO.java similarity index 99% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/UserVO.java rename to remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/UserVO.java index f7c71b2..6ae827f 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/vo/UserVO.java +++ b/remi-boot/remi-boot-domain/src/main/java/ai/remi/boot/domain/vo/UserVO.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.vo; +package ai.remi.boot.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/remi-boot/remi-boot-infra/pom.xml b/remi-boot/remi-boot-infra/pom.xml new file mode 100644 index 0000000..2c0c0ad --- /dev/null +++ b/remi-boot/remi-boot-infra/pom.xml @@ -0,0 +1,36 @@ + + + 4.0.0 + remi-boot-infra + remi-boot-infra + remi-boot-infra + + + ai.remi.top.boot + remi-boot + 3.1.0 + + + + + + ai.remi.top.comm + remi-comm-jdbc + + + + ai.remi.top.boot + remi-boot-domain + + + + org.slf4j + slf4j-simple + + + org.slf4j + slf4j-nop + + + diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AccessTokenMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AccessTokenMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AccessTokenMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AccessTokenMapper.java index ee058fb..0d82c80 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AccessTokenMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AccessTokenMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.AccessToken; +import ai.remi.boot.domain.entity.AccessToken; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AppGroupMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AppGroupMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AppGroupMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AppGroupMapper.java index 7f5d507..9a77df2 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AppGroupMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AppGroupMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.AppGroup; +import ai.remi.boot.domain.entity.AppGroup; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AppMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AppMapper.java similarity index 78% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AppMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AppMapper.java index 3a87aa0..f2d3e43 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AppMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AppMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.App; +import ai.remi.boot.domain.entity.App; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AppMenuMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AppMenuMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AppMenuMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AppMenuMapper.java index 852c16d..da0aca2 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AppMenuMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AppMenuMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.AppMenu; +import ai.remi.boot.domain.entity.AppMenu; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AppPublishMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AppPublishMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AppPublishMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AppPublishMapper.java index 16a20e0..ded9821 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AppPublishMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AppPublishMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.AppPublish; +import ai.remi.boot.domain.entity.AppPublish; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AreaMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AreaMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AreaMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AreaMapper.java index 1c4d2f8..0e79b47 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/AreaMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/AreaMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.Area; +import ai.remi.boot.domain.entity.Area; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/BucketMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/BucketMapper.java similarity index 78% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/BucketMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/BucketMapper.java index 55adcf9..b28b4b1 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/BucketMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/BucketMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.Bucket; +import ai.remi.boot.domain.entity.Bucket; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/CompanyDeptMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/CompanyDeptMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/CompanyDeptMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/CompanyDeptMapper.java index b3a65a2..b3f60b6 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/CompanyDeptMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/CompanyDeptMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.CompanyDept; +import ai.remi.boot.domain.entity.CompanyDept; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/CompanyMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/CompanyMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/CompanyMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/CompanyMapper.java index 843ff47..69af300 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/CompanyMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/CompanyMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.Company; +import ai.remi.boot.domain.entity.Company; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/ConfigMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/ConfigMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/ConfigMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/ConfigMapper.java index 2ef4084..9f29a90 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/ConfigMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/ConfigMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.Config; +import ai.remi.boot.domain.entity.Config; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/CordRoleMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/CordRoleMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/CordRoleMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/CordRoleMapper.java index af2c58c..37a5c4d 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/CordRoleMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/CordRoleMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.CordRole; +import ai.remi.boot.domain.entity.CordRole; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/DeptMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/DeptMapper.java similarity index 81% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/DeptMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/DeptMapper.java index ed20665..8e69c8a 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/DeptMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/DeptMapper.java @@ -1,9 +1,9 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.Dept; -import ai.remi.sys.domain.tree.DeptTree; -import ai.remi.sys.domain.vo.DeptVO; +import ai.remi.boot.domain.entity.Dept; +import ai.remi.boot.domain.tree.DeptTree; +import ai.remi.boot.domain.vo.DeptVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -23,8 +23,8 @@ public interface DeptMapper extends BaseMapper { " cd.company_id, " + " cd.company_code " + "FROM " + - " sys_dept d, " + - " sys_company_dept cd " + + " iam_dept d, " + + " iam_company_dept cd " + "WHERE " + " d.dept_code = cd.dept_code " + " AND d.id = cd.dept_id " + @@ -37,8 +37,8 @@ public interface DeptMapper extends BaseMapper { " cd.company_id, " + " cd.company_code " + "from " + - " sys_dept d, " + - " sys_company_dept cd " + + " iam_dept d, " + + " iam_company_dept cd " + "where " + " d.dept_code = cd.dept_code " + " and d.id = cd.dept_id " + diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/DeptUserMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/DeptUserMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/DeptUserMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/DeptUserMapper.java index 7e2ea65..440d1c4 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/DeptUserMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/DeptUserMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.DeptUser; +import ai.remi.boot.domain.entity.DeptUser; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/DictItemMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/DictItemMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/DictItemMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/DictItemMapper.java index df6e0cf..0ee3975 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/DictItemMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/DictItemMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.DictItem; +import ai.remi.boot.domain.entity.DictItem; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/DictMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/DictMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/DictMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/DictMapper.java index eb73370..ea692a4 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/DictMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/DictMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.Dict; +import ai.remi.boot.domain.entity.Dict; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/FileMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/FileMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/FileMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/FileMapper.java index 9718ee9..2fe4c7b 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/FileMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/FileMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.File; +import ai.remi.boot.domain.entity.File; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/GradeMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/GradeMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/GradeMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/GradeMapper.java index 0547b42..77fd7db 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/GradeMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/GradeMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.Grade; +import ai.remi.boot.domain.entity.Grade; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/GroupMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/GroupMapper.java similarity index 84% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/GroupMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/GroupMapper.java index af9989f..e556591 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/GroupMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/GroupMapper.java @@ -1,8 +1,8 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.Group; -import ai.remi.sys.domain.tree.GroupTree; +import ai.remi.boot.domain.entity.Group; +import ai.remi.boot.domain.tree.GroupTree; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -23,8 +23,8 @@ public interface GroupMapper extends BaseMapper { " ag.app_id, " + " ag.app_code " + "from " + - " sys_group g, " + - " sys_app_group ag " + + " iam_group g, " + + " iam_app_group ag " + "where " + " g.group_code = ag.group_code " + " AND g.id = ag.group_id " + diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/GroupRoleMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/GroupRoleMapper.java similarity index 78% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/GroupRoleMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/GroupRoleMapper.java index 78db710..722de77 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/GroupRoleMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/GroupRoleMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.GroupRole; +import ai.remi.boot.domain.entity.GroupRole; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/GroupUserMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/GroupUserMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/GroupUserMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/GroupUserMapper.java index 197e16d..d6165c7 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/GroupUserMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/GroupUserMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.GroupUser; +import ai.remi.boot.domain.entity.GroupUser; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/LogRecordMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/LogRecordMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/LogRecordMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/LogRecordMapper.java index 36ce027..2a519de 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/LogRecordMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/LogRecordMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.LogRecord; +import ai.remi.boot.domain.entity.LogRecord; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/MenuMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/MenuMapper.java similarity index 85% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/MenuMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/MenuMapper.java index d8055e9..b8dd52c 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/MenuMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/MenuMapper.java @@ -1,9 +1,9 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.Menu; -import ai.remi.sys.domain.tree.MenuTree; -import ai.remi.sys.domain.vo.MenuVO; +import ai.remi.boot.domain.entity.Menu; +import ai.remi.boot.domain.tree.MenuTree; +import ai.remi.boot.domain.vo.MenuVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -23,8 +23,8 @@ public interface MenuMapper extends BaseMapper { " am.app_id, " + " am.app_code " + "FROM " + - " sys_menu m, " + - " sys_app_menu am " + + " iam_menu m, " + + " iam_app_menu am " + "WHERE " + " m.menu_code = am.menu_code " + " AND m.id = am.menu_id " + @@ -37,8 +37,8 @@ public interface MenuMapper extends BaseMapper { " am.app_id, " + " am.app_code " + "from " + - " sys_menu m, " + - " sys_app_menu am " + + " iam_menu m, " + + " iam_app_menu am " + "where " + " m.menu_code = am.menu_code " + " AND m.id = am.menu_id " + @@ -56,8 +56,8 @@ public interface MenuMapper extends BaseMapper { " am.app_id, " + " am.app_code " + "from " + - " sys_menu m, " + - " sys_app_menu am " + + " iam_menu m, " + + " iam_app_menu am " + "where " + " m.menu_code = am.menu_code " + " AND m.id = am.menu_id " + diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/NoticeMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/NoticeMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/NoticeMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/NoticeMapper.java index 8f30bc1..c31046c 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/NoticeMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/NoticeMapper.java @@ -1,6 +1,6 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; -import ai.remi.sys.domain.entity.Notice; +import ai.remi.boot.domain.entity.Notice; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/OauthCodeMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/OauthCodeMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/OauthCodeMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/OauthCodeMapper.java index b50ef90..89ce8c0 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/OauthCodeMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/OauthCodeMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.OauthCode; +import ai.remi.boot.domain.entity.OauthCode; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/PositionMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/PositionMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/PositionMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/PositionMapper.java index 77fbc0b..2af41b6 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/PositionMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/PositionMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.Position; +import ai.remi.boot.domain.entity.Position; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/PostRoleMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/PostRoleMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/PostRoleMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/PostRoleMapper.java index 4bf12bf..29a244e 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/PostRoleMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/PostRoleMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.PostRole; +import ai.remi.boot.domain.entity.PostRole; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/RankMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/RankMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/RankMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/RankMapper.java index 73a3d30..f56533a 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/RankMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/RankMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.Rank; +import ai.remi.boot.domain.entity.Rank; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/RefreshTokenMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/RefreshTokenMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/RefreshTokenMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/RefreshTokenMapper.java index 69e95b1..1be1ddd 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/RefreshTokenMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/RefreshTokenMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.RefreshToken; +import ai.remi.boot.domain.entity.RefreshToken; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/RestrictIpMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/RestrictIpMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/RestrictIpMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/RestrictIpMapper.java index 4413729..a1f546a 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/RestrictIpMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/RestrictIpMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.RestrictIp; +import ai.remi.boot.domain.entity.RestrictIp; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/RoleMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/RoleMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/RoleMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/RoleMapper.java index a19f038..ca47413 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/RoleMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/RoleMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.Role; +import ai.remi.boot.domain.entity.Role; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/RoleMenuMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/RoleMenuMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/RoleMenuMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/RoleMenuMapper.java index 56afc1e..48c0395 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/RoleMenuMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/RoleMenuMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.RoleMenu; +import ai.remi.boot.domain.entity.RoleMenu; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/UserMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/UserMapper.java similarity index 88% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/UserMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/UserMapper.java index fc91230..4940573 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/UserMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/UserMapper.java @@ -1,9 +1,9 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.User; -import ai.remi.sys.domain.query.UserQuery; -import ai.remi.sys.domain.vo.UserVO; +import ai.remi.boot.domain.entity.User; +import ai.remi.boot.domain.query.UserQuery; +import ai.remi.boot.domain.vo.UserVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -29,10 +29,10 @@ public interface UserMapper extends BaseMapper { " cd.company_id, " + " cd.company_code " + "FROM " + - " sys_user u, " + - " sys_user_post up, " + - " sys_dept_user du, " + - " sys_company_dept cd " + + " iam_user u, " + + " iam_user_post up, " + + " iam_dept_user du, " + + " iam_company_dept cd " + "WHERE " + " u.id = du.user_id " + " and u.user_code = du.user_code " + @@ -51,9 +51,9 @@ public interface UserMapper extends BaseMapper { " cd.company_id, " + " cd.company_code " + "from " + - " sys_user u, " + - " sys_dept_user du, " + - " sys_company_dept cd " + + " iam_user u, " + + " iam_dept_user du, " + + " iam_company_dept cd " + "where " + " u.id = du.user_id " + " and u.user_code = du.user_code " + @@ -86,10 +86,10 @@ public interface UserMapper extends BaseMapper { " cd.company_id, " + " cd.company_code " + "from " + - " sys_user u, " + - " sys_user_post up, " + - " sys_dept_user du, " + - " sys_company_dept cd " + + " iam_user u, " + + " iam_user_post up, " + + " iam_dept_user du, " + + " iam_company_dept cd " + "where " + " u.id = du.user_id " + " and u.user_code = du.user_code " + @@ -117,9 +117,9 @@ public interface UserMapper extends BaseMapper { "select " + " count(u.id) as total " + "from " + - " sys_user u, " + - " sys_dept_user du, " + - " sys_company_dept cd " + + " iam_user u, " + + " iam_dept_user du, " + + " iam_company_dept cd " + "where " + " u.id = du.user_id " + " and u.user_code = du.user_code " + diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/UserPostMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/UserPostMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/UserPostMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/UserPostMapper.java index c0b7069..e4487c2 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/UserPostMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/UserPostMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.UserPost; +import ai.remi.boot.domain.entity.UserPost; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/UserRoleMapper.java b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/UserRoleMapper.java similarity index 77% rename from remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/UserRoleMapper.java rename to remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/UserRoleMapper.java index 55cc9c3..04de857 100644 --- a/remi-sys/remi-sys-infra/src/main/java/ai/remi/sys/infra/mapper/UserRoleMapper.java +++ b/remi-boot/remi-boot-infra/src/main/java/ai/remi/boot/infra/mapper/UserRoleMapper.java @@ -1,7 +1,7 @@ -package ai.remi.sys.infra.mapper; +package ai.remi.boot.infra.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ai.remi.sys.domain.entity.UserRole; +import ai.remi.boot.domain.entity.UserRole; import org.apache.ibatis.annotations.Mapper; /** diff --git a/remi-sys/remi-sys-job/README.md b/remi-boot/remi-boot-job/README.md similarity index 100% rename from remi-sys/remi-sys-job/README.md rename to remi-boot/remi-boot-job/README.md diff --git a/remi-boot/remi-boot-job/pom.xml b/remi-boot/remi-boot-job/pom.xml new file mode 100644 index 0000000..4ac73ea --- /dev/null +++ b/remi-boot/remi-boot-job/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + remi-boot-job + remi-boot-job + remi-boot-job + + + ai.remi.top.boot + remi-boot + 3.1.0 + + + + + + ai.remi.top.comm + remi-comm-job + + + + ai.remi.top.boot + remi-boot-server + + + + org.slf4j + slf4j-simple + + + org.slf4j + slf4j-nop + + + + diff --git a/remi-demo/remi-demo-job/src/main/java/ai/remi/demo/job/handler/DemoJobHandler.java b/remi-boot/remi-boot-job/src/main/java/ai/remi/boot/job/handler/DemoJobHandler.java similarity index 99% rename from remi-demo/remi-demo-job/src/main/java/ai/remi/demo/job/handler/DemoJobHandler.java rename to remi-boot/remi-boot-job/src/main/java/ai/remi/boot/job/handler/DemoJobHandler.java index 3464154..a7463fc 100644 --- a/remi-demo/remi-demo-job/src/main/java/ai/remi/demo/job/handler/DemoJobHandler.java +++ b/remi-boot/remi-boot-job/src/main/java/ai/remi/boot/job/handler/DemoJobHandler.java @@ -1,4 +1,4 @@ -package ai.remi.demo.job.handler; +package ai.remi.boot.job.handler; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobHelper; diff --git a/remi-boot/remi-boot-server/pom.xml b/remi-boot/remi-boot-server/pom.xml new file mode 100644 index 0000000..b2e4597 --- /dev/null +++ b/remi-boot/remi-boot-server/pom.xml @@ -0,0 +1,50 @@ + + + 4.0.0 + remi-boot-server + remi-boot-server + remi-boot-server + + + ai.remi.top.boot + remi-boot + 3.1.0 + + + + + + ai.remi.top.comm + remi-comm-exception + + + ai.remi.top.comm + remi-comm-redis + + + ai.remi.top.comm + remi-comm-thread + + + ai.remi.top.comm + remi-comm-util + + + + ai.remi.top.boot + remi-boot-infra + + + + org.slf4j + slf4j-simple + + + org.slf4j + slf4j-nop + + + + + diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/exception/IamExceptionCode.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/exception/IamExceptionCode.java similarity index 95% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/exception/IamExceptionCode.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/exception/IamExceptionCode.java index f43d00d..290765d 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/exception/IamExceptionCode.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/exception/IamExceptionCode.java @@ -1,4 +1,4 @@ -package ai.remi.sys.server.exception; +package ai.remi.boot.server.exception; import ai.remi.comm.exception.enums.ExceptionCode; import lombok.AllArgsConstructor; diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/exception/IamServiceException.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/exception/IamServiceException.java similarity index 94% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/exception/IamServiceException.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/exception/IamServiceException.java index 54f9c52..bcf7639 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/exception/IamServiceException.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/exception/IamServiceException.java @@ -1,4 +1,4 @@ -package ai.remi.sys.server.exception; +package ai.remi.boot.server.exception; import ai.remi.comm.exception.custom.BusinessException; diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AccessTokenService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AccessTokenService.java similarity index 80% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AccessTokenService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AccessTokenService.java index 9798df1..aa263cb 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AccessTokenService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AccessTokenService.java @@ -1,8 +1,8 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.AccessToken; -import ai.remi.sys.domain.entity.OauthCode; +import ai.remi.boot.domain.entity.AccessToken; +import ai.remi.boot.domain.entity.OauthCode; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AppGroupService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AppGroupService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AppGroupService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AppGroupService.java index 30cdce8..ab7c235 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AppGroupService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AppGroupService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.AppGroup; +import ai.remi.boot.domain.entity.AppGroup; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AppMenuService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AppMenuService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AppMenuService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AppMenuService.java index fac3925..e93049f 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AppMenuService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AppMenuService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.AppMenu; +import ai.remi.boot.domain.entity.AppMenu; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AppPublishService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AppPublishService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AppPublishService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AppPublishService.java index 02851e9..8453ea3 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AppPublishService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AppPublishService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.AppPublish; +import ai.remi.boot.domain.entity.AppPublish; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AppService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AppService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AppService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AppService.java index a1504e9..b4b7a61 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AppService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AppService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.App; +import ai.remi.boot.domain.entity.App; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AreaService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AreaService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AreaService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AreaService.java index b8e27e8..7823bc3 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/AreaService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/AreaService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.Area; +import ai.remi.boot.domain.entity.Area; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/BucketService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/BucketService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/BucketService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/BucketService.java index c0dcf7b..4dc8b7a 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/BucketService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/BucketService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.Bucket; +import ai.remi.boot.domain.entity.Bucket; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/CompanyDeptService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/CompanyDeptService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/CompanyDeptService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/CompanyDeptService.java index eb368c7..8e35fe0 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/CompanyDeptService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/CompanyDeptService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.CompanyDept; +import ai.remi.boot.domain.entity.CompanyDept; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/CompanyService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/CompanyService.java similarity index 73% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/CompanyService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/CompanyService.java index 94009fb..4f63f7a 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/CompanyService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/CompanyService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.Company; +import ai.remi.boot.domain.entity.Company; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/ConfigService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/ConfigService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/ConfigService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/ConfigService.java index 953e6e1..a3c9f21 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/ConfigService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/ConfigService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.Config; +import ai.remi.boot.domain.entity.Config; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/CordRoleService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/CordRoleService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/CordRoleService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/CordRoleService.java index 9a5b7df..3f4881c 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/CordRoleService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/CordRoleService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.CordRole; +import ai.remi.boot.domain.entity.CordRole; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/DeptService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/DeptService.java similarity index 73% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/DeptService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/DeptService.java index b83370d..a0aeeb0 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/DeptService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/DeptService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.Dept; +import ai.remi.boot.domain.entity.Dept; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/DeptUserService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/DeptUserService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/DeptUserService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/DeptUserService.java index cb51474..3f0bf23 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/DeptUserService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/DeptUserService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.DeptUser; +import ai.remi.boot.domain.entity.DeptUser; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/DictItemService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/DictItemService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/DictItemService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/DictItemService.java index 518dea4..6ec3aed 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/DictItemService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/DictItemService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.DictItem; +import ai.remi.boot.domain.entity.DictItem; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/DictService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/DictService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/DictService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/DictService.java index 30c2b0b..231080a 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/DictService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/DictService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.Dict; +import ai.remi.boot.domain.entity.Dict; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/FileService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/FileService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/FileService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/FileService.java index 67238ca..63190d6 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/FileService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/FileService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.File; +import ai.remi.boot.domain.entity.File; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/GradeService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/GradeService.java similarity index 73% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/GradeService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/GradeService.java index ad7cbad..60b823e 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/GradeService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/GradeService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.Grade; +import ai.remi.boot.domain.entity.Grade; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/GroupRoleService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/GroupRoleService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/GroupRoleService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/GroupRoleService.java index 415608b..550ce08 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/GroupRoleService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/GroupRoleService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.GroupRole; +import ai.remi.boot.domain.entity.GroupRole; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/GroupService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/GroupService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/GroupService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/GroupService.java index 2fe5ead..fa98419 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/GroupService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/GroupService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.Group; +import ai.remi.boot.domain.entity.Group; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/GroupUserService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/GroupUserService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/GroupUserService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/GroupUserService.java index 0734893..6ff83c6 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/GroupUserService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/GroupUserService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.GroupUser; +import ai.remi.boot.domain.entity.GroupUser; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/LogRecordService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/LogRecordService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/LogRecordService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/LogRecordService.java index 64cf366..060850e 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/LogRecordService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/LogRecordService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.LogRecord; +import ai.remi.boot.domain.entity.LogRecord; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/MenuService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/MenuService.java similarity index 73% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/MenuService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/MenuService.java index 01e6755..9204977 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/MenuService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/MenuService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.Menu; +import ai.remi.boot.domain.entity.Menu; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/NoticeService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/NoticeService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/NoticeService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/NoticeService.java index 95c674a..921676d 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/NoticeService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/NoticeService.java @@ -1,6 +1,6 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; -import ai.remi.sys.domain.entity.Notice; +import ai.remi.boot.domain.entity.Notice; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/OauthCodeService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/OauthCodeService.java similarity index 77% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/OauthCodeService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/OauthCodeService.java index d0967c1..e058dba 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/OauthCodeService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/OauthCodeService.java @@ -1,8 +1,8 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.dto.post.OauthCodePostDTO; -import ai.remi.sys.domain.entity.OauthCode; +import ai.remi.boot.domain.dto.post.OauthCodePostDTO; +import ai.remi.boot.domain.entity.OauthCode; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/PositionService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/PositionService.java similarity index 73% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/PositionService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/PositionService.java index cbbc6a2..d9bf788 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/PositionService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/PositionService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.Position; +import ai.remi.boot.domain.entity.Position; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/PostRoleService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/PostRoleService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/PostRoleService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/PostRoleService.java index b1829f2..d693b82 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/PostRoleService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/PostRoleService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.PostRole; +import ai.remi.boot.domain.entity.PostRole; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/RankService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/RankService.java similarity index 73% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/RankService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/RankService.java index 22d1877..475540a 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/RankService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/RankService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.Rank; +import ai.remi.boot.domain.entity.Rank; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/RefreshTokenService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/RefreshTokenService.java similarity index 78% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/RefreshTokenService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/RefreshTokenService.java index 379ee96..71793fe 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/RefreshTokenService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/RefreshTokenService.java @@ -1,8 +1,8 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.AccessToken; -import ai.remi.sys.domain.entity.RefreshToken; +import ai.remi.boot.domain.entity.AccessToken; +import ai.remi.boot.domain.entity.RefreshToken; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/RestrictIpService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/RestrictIpService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/RestrictIpService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/RestrictIpService.java index 12b428c..3807baf 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/RestrictIpService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/RestrictIpService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.RestrictIp; +import ai.remi.boot.domain.entity.RestrictIp; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/RoleMenuService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/RoleMenuService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/RoleMenuService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/RoleMenuService.java index 3719c54..bf2c04d 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/RoleMenuService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/RoleMenuService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.RoleMenu; +import ai.remi.boot.domain.entity.RoleMenu; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/RoleService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/RoleService.java similarity index 73% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/RoleService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/RoleService.java index 7e71529..cfc59bf 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/RoleService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/RoleService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.Role; +import ai.remi.boot.domain.entity.Role; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/UserPostService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/UserPostService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/UserPostService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/UserPostService.java index 3e90d42..15b483d 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/UserPostService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/UserPostService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.UserPost; +import ai.remi.boot.domain.entity.UserPost; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/UserRoleService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/UserRoleService.java similarity index 74% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/UserRoleService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/UserRoleService.java index 71640ef..c97a0dd 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/UserRoleService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/UserRoleService.java @@ -1,7 +1,7 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.UserRole; +import ai.remi.boot.domain.entity.UserRole; /** * @author DianJiu diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/UserService.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/UserService.java similarity index 64% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/UserService.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/UserService.java index 0652bf8..2031801 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/UserService.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/UserService.java @@ -1,8 +1,8 @@ -package ai.remi.sys.server.service; +package ai.remi.boot.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import ai.remi.sys.domain.entity.User; -import ai.remi.sys.domain.vo.UserVO; +import ai.remi.boot.domain.entity.User; +import ai.remi.boot.domain.vo.UserVO; /** * @author DianJiu @@ -16,6 +16,4 @@ public interface UserService extends IService { UserVO getUserById(String id); User login(String username, String password); - - boolean updatePwd(String userId, String nowPassword, String newPassword); } diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AccessTokenServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AccessTokenServiceImpl.java similarity index 90% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AccessTokenServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AccessTokenServiceImpl.java index 2b1861b..900a7c4 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AccessTokenServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AccessTokenServiceImpl.java @@ -1,4 +1,4 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -7,13 +7,13 @@ import ai.remi.comm.util.collection.CollectionUtils; import ai.remi.comm.util.date.LocalDateTimeUtils; import ai.remi.comm.util.id.UUIDUtils; import ai.remi.comm.util.object.ObjectUtils; -import ai.remi.sys.domain.entity.AccessToken; -import ai.remi.sys.domain.entity.OauthCode; -import ai.remi.sys.domain.enums.RedisKeyEnum; -import ai.remi.sys.domain.vo.UserVO; -import ai.remi.sys.infra.mapper.AccessTokenMapper; -import ai.remi.sys.server.service.AccessTokenService; -import ai.remi.sys.server.service.UserService; +import ai.remi.boot.domain.entity.AccessToken; +import ai.remi.boot.domain.entity.OauthCode; +import ai.remi.boot.domain.enums.RedisKeyEnum; +import ai.remi.boot.domain.vo.UserVO; +import ai.remi.boot.infra.mapper.AccessTokenMapper; +import ai.remi.boot.server.service.AccessTokenService; +import ai.remi.boot.server.service.UserService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AppGroupServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AppGroupServiceImpl.java similarity index 65% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AppGroupServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AppGroupServiceImpl.java index 6bc31c3..1d0c720 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AppGroupServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AppGroupServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.AppGroup; -import ai.remi.sys.infra.mapper.AppGroupMapper; -import ai.remi.sys.server.service.AppGroupService; +import ai.remi.boot.domain.entity.AppGroup; +import ai.remi.boot.infra.mapper.AppGroupMapper; +import ai.remi.boot.server.service.AppGroupService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AppMenuServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AppMenuServiceImpl.java similarity index 66% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AppMenuServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AppMenuServiceImpl.java index 3276024..c99f9a0 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AppMenuServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AppMenuServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.AppMenu; -import ai.remi.sys.infra.mapper.AppMenuMapper; -import ai.remi.sys.server.service.AppMenuService; +import ai.remi.boot.domain.entity.AppMenu; +import ai.remi.boot.infra.mapper.AppMenuMapper; +import ai.remi.boot.server.service.AppMenuService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AppPublishServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AppPublishServiceImpl.java similarity index 66% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AppPublishServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AppPublishServiceImpl.java index 6fb6bce..a552c01 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AppPublishServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AppPublishServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.AppPublish; -import ai.remi.sys.infra.mapper.AppPublishMapper; -import ai.remi.sys.server.service.AppPublishService; +import ai.remi.boot.domain.entity.AppPublish; +import ai.remi.boot.infra.mapper.AppPublishMapper; +import ai.remi.boot.server.service.AppPublishService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AppServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AppServiceImpl.java similarity index 66% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AppServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AppServiceImpl.java index 18a8ba8..c80503f 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AppServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AppServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.App; -import ai.remi.sys.infra.mapper.AppMapper; -import ai.remi.sys.server.service.AppService; +import ai.remi.boot.domain.entity.App; +import ai.remi.boot.infra.mapper.AppMapper; +import ai.remi.boot.server.service.AppService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AreaServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AreaServiceImpl.java similarity index 65% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AreaServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AreaServiceImpl.java index 145e5a1..f44fdb7 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/AreaServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/AreaServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.Area; -import ai.remi.sys.infra.mapper.AreaMapper; -import ai.remi.sys.server.service.AreaService; +import ai.remi.boot.domain.entity.Area; +import ai.remi.boot.infra.mapper.AreaMapper; +import ai.remi.boot.server.service.AreaService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/BucketServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/BucketServiceImpl.java similarity index 66% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/BucketServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/BucketServiceImpl.java index 5fcb077..0137722 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/BucketServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/BucketServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.Bucket; -import ai.remi.sys.infra.mapper.BucketMapper; -import ai.remi.sys.server.service.BucketService; +import ai.remi.boot.domain.entity.Bucket; +import ai.remi.boot.infra.mapper.BucketMapper; +import ai.remi.boot.server.service.BucketService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/CompanyDeptServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/CompanyDeptServiceImpl.java similarity index 66% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/CompanyDeptServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/CompanyDeptServiceImpl.java index 7d4b30e..079ccb0 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/CompanyDeptServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/CompanyDeptServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.CompanyDept; -import ai.remi.sys.infra.mapper.CompanyDeptMapper; -import ai.remi.sys.server.service.CompanyDeptService; +import ai.remi.boot.domain.entity.CompanyDept; +import ai.remi.boot.infra.mapper.CompanyDeptMapper; +import ai.remi.boot.server.service.CompanyDeptService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/CompanyServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/CompanyServiceImpl.java similarity index 65% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/CompanyServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/CompanyServiceImpl.java index 7487b32..4873804 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/CompanyServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/CompanyServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.Company; -import ai.remi.sys.infra.mapper.CompanyMapper; -import ai.remi.sys.server.service.CompanyService; +import ai.remi.boot.domain.entity.Company; +import ai.remi.boot.infra.mapper.CompanyMapper; +import ai.remi.boot.server.service.CompanyService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/ConfigServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/ConfigServiceImpl.java similarity index 65% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/ConfigServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/ConfigServiceImpl.java index cf76e64..44b1086 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/ConfigServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/ConfigServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.Config; -import ai.remi.sys.infra.mapper.ConfigMapper; -import ai.remi.sys.server.service.ConfigService; +import ai.remi.boot.domain.entity.Config; +import ai.remi.boot.infra.mapper.ConfigMapper; +import ai.remi.boot.server.service.ConfigService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/CordRoleServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/CordRoleServiceImpl.java similarity index 66% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/CordRoleServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/CordRoleServiceImpl.java index 7f9351f..6758d44 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/CordRoleServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/CordRoleServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.CordRole; -import ai.remi.sys.infra.mapper.CordRoleMapper; -import ai.remi.sys.server.service.CordRoleService; +import ai.remi.boot.domain.entity.CordRole; +import ai.remi.boot.infra.mapper.CordRoleMapper; +import ai.remi.boot.server.service.CordRoleService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/DeptServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/DeptServiceImpl.java similarity index 65% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/DeptServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/DeptServiceImpl.java index da4ad19..3ffcd38 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/DeptServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/DeptServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.Dept; -import ai.remi.sys.infra.mapper.DeptMapper; -import ai.remi.sys.server.service.DeptService; +import ai.remi.boot.domain.entity.Dept; +import ai.remi.boot.infra.mapper.DeptMapper; +import ai.remi.boot.server.service.DeptService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/DeptUserServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/DeptUserServiceImpl.java similarity index 66% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/DeptUserServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/DeptUserServiceImpl.java index 7cbec29..6924c68 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/DeptUserServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/DeptUserServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.DeptUser; -import ai.remi.sys.infra.mapper.DeptUserMapper; -import ai.remi.sys.server.service.DeptUserService; +import ai.remi.boot.domain.entity.DeptUser; +import ai.remi.boot.infra.mapper.DeptUserMapper; +import ai.remi.boot.server.service.DeptUserService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/DictItemServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/DictItemServiceImpl.java similarity index 65% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/DictItemServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/DictItemServiceImpl.java index 9619a31..0e9b21c 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/DictItemServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/DictItemServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.DictItem; -import ai.remi.sys.infra.mapper.DictItemMapper; -import ai.remi.sys.server.service.DictItemService; +import ai.remi.boot.domain.entity.DictItem; +import ai.remi.boot.infra.mapper.DictItemMapper; +import ai.remi.boot.server.service.DictItemService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/DictServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/DictServiceImpl.java similarity index 65% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/DictServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/DictServiceImpl.java index 66ac701..6ef7b21 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/DictServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/DictServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.Dict; -import ai.remi.sys.infra.mapper.DictMapper; -import ai.remi.sys.server.service.DictService; +import ai.remi.boot.domain.entity.Dict; +import ai.remi.boot.infra.mapper.DictMapper; +import ai.remi.boot.server.service.DictService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/FileServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/FileServiceImpl.java similarity index 65% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/FileServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/FileServiceImpl.java index 14fb24f..3c541b2 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/FileServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/FileServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.File; -import ai.remi.sys.infra.mapper.FileMapper; -import ai.remi.sys.server.service.FileService; +import ai.remi.boot.domain.entity.File; +import ai.remi.boot.infra.mapper.FileMapper; +import ai.remi.boot.server.service.FileService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/GradeServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/GradeServiceImpl.java similarity index 65% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/GradeServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/GradeServiceImpl.java index 63a27f3..4bf8beb 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/GradeServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/GradeServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.Grade; -import ai.remi.sys.infra.mapper.GradeMapper; -import ai.remi.sys.server.service.GradeService; +import ai.remi.boot.domain.entity.Grade; +import ai.remi.boot.infra.mapper.GradeMapper; +import ai.remi.boot.server.service.GradeService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/GroupRoleServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/GroupRoleServiceImpl.java similarity index 66% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/GroupRoleServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/GroupRoleServiceImpl.java index 5e9264a..d06ec43 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/GroupRoleServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/GroupRoleServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.GroupRole; -import ai.remi.sys.infra.mapper.GroupRoleMapper; -import ai.remi.sys.server.service.GroupRoleService; +import ai.remi.boot.domain.entity.GroupRole; +import ai.remi.boot.infra.mapper.GroupRoleMapper; +import ai.remi.boot.server.service.GroupRoleService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/GroupServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/GroupServiceImpl.java similarity index 65% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/GroupServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/GroupServiceImpl.java index 6ffd138..53e7ff1 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/GroupServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/GroupServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.Group; -import ai.remi.sys.infra.mapper.GroupMapper; -import ai.remi.sys.server.service.GroupService; +import ai.remi.boot.domain.entity.Group; +import ai.remi.boot.infra.mapper.GroupMapper; +import ai.remi.boot.server.service.GroupService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/GroupUserServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/GroupUserServiceImpl.java similarity index 65% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/GroupUserServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/GroupUserServiceImpl.java index ed170cd..b344def 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/GroupUserServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/GroupUserServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.GroupUser; -import ai.remi.sys.infra.mapper.GroupUserMapper; -import ai.remi.sys.server.service.GroupUserService; +import ai.remi.boot.domain.entity.GroupUser; +import ai.remi.boot.infra.mapper.GroupUserMapper; +import ai.remi.boot.server.service.GroupUserService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/LogRecordServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/LogRecordServiceImpl.java similarity index 66% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/LogRecordServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/LogRecordServiceImpl.java index 4fba4ff..a025ad6 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/LogRecordServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/LogRecordServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.LogRecord; -import ai.remi.sys.infra.mapper.LogRecordMapper; -import ai.remi.sys.server.service.LogRecordService; +import ai.remi.boot.domain.entity.LogRecord; +import ai.remi.boot.infra.mapper.LogRecordMapper; +import ai.remi.boot.server.service.LogRecordService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/MenuServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/MenuServiceImpl.java similarity index 65% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/MenuServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/MenuServiceImpl.java index ea3ff27..2e16b95 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/MenuServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/MenuServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.Menu; -import ai.remi.sys.infra.mapper.MenuMapper; -import ai.remi.sys.server.service.MenuService; +import ai.remi.boot.domain.entity.Menu; +import ai.remi.boot.infra.mapper.MenuMapper; +import ai.remi.boot.server.service.MenuService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/NoticeServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/NoticeServiceImpl.java similarity index 65% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/NoticeServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/NoticeServiceImpl.java index 2a6bd10..f86f5d2 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/NoticeServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/NoticeServiceImpl.java @@ -1,8 +1,8 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; -import ai.remi.sys.domain.entity.Notice; -import ai.remi.sys.infra.mapper.NoticeMapper; -import ai.remi.sys.server.service.NoticeService; +import ai.remi.boot.domain.entity.Notice; +import ai.remi.boot.infra.mapper.NoticeMapper; +import ai.remi.boot.server.service.NoticeService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/OauthCodeServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/OauthCodeServiceImpl.java similarity index 87% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/OauthCodeServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/OauthCodeServiceImpl.java index fa219f7..17ee3c9 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/OauthCodeServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/OauthCodeServiceImpl.java @@ -1,4 +1,4 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -6,13 +6,13 @@ import ai.remi.comm.redis.service.RedisService; import ai.remi.comm.util.collection.CollectionUtils; import ai.remi.comm.util.date.LocalDateTimeUtils; import ai.remi.comm.util.object.ObjectUtils; -import ai.remi.sys.domain.converter.OauthCodeConverter; -import ai.remi.sys.domain.dto.post.OauthCodePostDTO; -import ai.remi.sys.domain.entity.OauthCode; -import ai.remi.sys.domain.enums.RedisKeyEnum; -import ai.remi.sys.infra.mapper.OauthCodeMapper; -import ai.remi.sys.server.service.OauthCodeService; -import ai.remi.sys.server.util.AuthUtils; +import ai.remi.boot.domain.converter.OauthCodeConverter; +import ai.remi.boot.domain.dto.post.OauthCodePostDTO; +import ai.remi.boot.domain.entity.OauthCode; +import ai.remi.boot.domain.enums.RedisKeyEnum; +import ai.remi.boot.infra.mapper.OauthCodeMapper; +import ai.remi.boot.server.service.OauthCodeService; +import ai.remi.boot.server.util.AuthUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/PositionServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/PositionServiceImpl.java similarity index 65% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/PositionServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/PositionServiceImpl.java index bf96c70..93f09b0 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/PositionServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/PositionServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.Position; -import ai.remi.sys.infra.mapper.PositionMapper; -import ai.remi.sys.server.service.PositionService; +import ai.remi.boot.domain.entity.Position; +import ai.remi.boot.infra.mapper.PositionMapper; +import ai.remi.boot.server.service.PositionService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/PostRoleServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/PostRoleServiceImpl.java similarity index 66% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/PostRoleServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/PostRoleServiceImpl.java index f18aab2..94830e5 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/PostRoleServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/PostRoleServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.PostRole; -import ai.remi.sys.infra.mapper.PostRoleMapper; -import ai.remi.sys.server.service.PostRoleService; +import ai.remi.boot.domain.entity.PostRole; +import ai.remi.boot.infra.mapper.PostRoleMapper; +import ai.remi.boot.server.service.PostRoleService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/RankServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/RankServiceImpl.java similarity index 65% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/RankServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/RankServiceImpl.java index 34c1e94..2a3d05d 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/RankServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/RankServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.Rank; -import ai.remi.sys.infra.mapper.RankMapper; -import ai.remi.sys.server.service.RankService; +import ai.remi.boot.domain.entity.Rank; +import ai.remi.boot.infra.mapper.RankMapper; +import ai.remi.boot.server.service.RankService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/RefreshTokenServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/RefreshTokenServiceImpl.java similarity index 89% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/RefreshTokenServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/RefreshTokenServiceImpl.java index beac5b0..b041c71 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/RefreshTokenServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/RefreshTokenServiceImpl.java @@ -1,4 +1,4 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -6,11 +6,11 @@ import ai.remi.comm.redis.service.RedisService; import ai.remi.comm.util.collection.CollectionUtils; import ai.remi.comm.util.date.LocalDateTimeUtils; import ai.remi.comm.util.object.ObjectUtils; -import ai.remi.sys.domain.entity.AccessToken; -import ai.remi.sys.domain.entity.RefreshToken; -import ai.remi.sys.domain.enums.RedisKeyEnum; -import ai.remi.sys.infra.mapper.RefreshTokenMapper; -import ai.remi.sys.server.service.RefreshTokenService; +import ai.remi.boot.domain.entity.AccessToken; +import ai.remi.boot.domain.entity.RefreshToken; +import ai.remi.boot.domain.enums.RedisKeyEnum; +import ai.remi.boot.infra.mapper.RefreshTokenMapper; +import ai.remi.boot.server.service.RefreshTokenService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/RestrictIpServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/RestrictIpServiceImpl.java similarity index 66% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/RestrictIpServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/RestrictIpServiceImpl.java index 5547513..2f340a5 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/RestrictIpServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/RestrictIpServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.RestrictIp; -import ai.remi.sys.infra.mapper.RestrictIpMapper; -import ai.remi.sys.server.service.RestrictIpService; +import ai.remi.boot.domain.entity.RestrictIp; +import ai.remi.boot.infra.mapper.RestrictIpMapper; +import ai.remi.boot.server.service.RestrictIpService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/RoleMenuServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/RoleMenuServiceImpl.java similarity index 66% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/RoleMenuServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/RoleMenuServiceImpl.java index bcccf13..915cd5c 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/RoleMenuServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/RoleMenuServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.RoleMenu; -import ai.remi.sys.infra.mapper.RoleMenuMapper; -import ai.remi.sys.server.service.RoleMenuService; +import ai.remi.boot.domain.entity.RoleMenu; +import ai.remi.boot.infra.mapper.RoleMenuMapper; +import ai.remi.boot.server.service.RoleMenuService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/RoleServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/RoleServiceImpl.java similarity index 65% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/RoleServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/RoleServiceImpl.java index e00dcc1..e758078 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/RoleServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/RoleServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.Role; -import ai.remi.sys.infra.mapper.RoleMapper; -import ai.remi.sys.server.service.RoleService; +import ai.remi.boot.domain.entity.Role; +import ai.remi.boot.infra.mapper.RoleMapper; +import ai.remi.boot.server.service.RoleService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/UserPostServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/UserPostServiceImpl.java similarity index 66% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/UserPostServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/UserPostServiceImpl.java index 6e8666a..eb849ca 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/UserPostServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/UserPostServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.UserPost; -import ai.remi.sys.infra.mapper.UserPostMapper; -import ai.remi.sys.server.service.UserPostService; +import ai.remi.boot.domain.entity.UserPost; +import ai.remi.boot.infra.mapper.UserPostMapper; +import ai.remi.boot.server.service.UserPostService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/UserRoleServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/UserRoleServiceImpl.java similarity index 66% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/UserRoleServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/UserRoleServiceImpl.java index aa5b69e..6be7c4d 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/UserRoleServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/UserRoleServiceImpl.java @@ -1,9 +1,9 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ai.remi.sys.domain.entity.UserRole; -import ai.remi.sys.infra.mapper.UserRoleMapper; -import ai.remi.sys.server.service.UserRoleService; +import ai.remi.boot.domain.entity.UserRole; +import ai.remi.boot.infra.mapper.UserRoleMapper; +import ai.remi.boot.server.service.UserRoleService; import org.springframework.stereotype.Service; /** diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/UserServiceImpl.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/UserServiceImpl.java similarity index 90% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/UserServiceImpl.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/UserServiceImpl.java index a5b9db3..045af0f 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/service/impl/UserServiceImpl.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/service/impl/UserServiceImpl.java @@ -1,19 +1,19 @@ -package ai.remi.sys.server.service.impl; +package ai.remi.boot.server.service.impl; +import ai.remi.boot.domain.converter.RoleConverter; +import ai.remi.boot.domain.entity.*; +import ai.remi.boot.domain.tree.MenuTree; +import ai.remi.boot.domain.vo.AppMenuVO; +import ai.remi.boot.domain.vo.ConfigVO; +import ai.remi.boot.domain.vo.RoleVO; +import ai.remi.boot.domain.vo.UserVO; +import ai.remi.boot.infra.mapper.MenuMapper; +import ai.remi.boot.infra.mapper.UserMapper; +import ai.remi.boot.server.service.*; import ai.remi.comm.domain.tree.TreeBuild; import ai.remi.comm.util.bean.BeanCopyUtils; import ai.remi.comm.util.collection.CollectionUtils; import ai.remi.comm.util.object.ObjectUtils; -import ai.remi.sys.domain.converter.RoleConverter; -import ai.remi.sys.domain.entity.*; -import ai.remi.sys.domain.tree.MenuTree; -import ai.remi.sys.domain.vo.AppMenuVO; -import ai.remi.sys.domain.vo.ConfigVO; -import ai.remi.sys.domain.vo.RoleVO; -import ai.remi.sys.domain.vo.UserVO; -import ai.remi.sys.infra.mapper.MenuMapper; -import ai.remi.sys.infra.mapper.UserMapper; -import ai.remi.sys.server.service.*; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -94,16 +94,6 @@ public class UserServiceImpl extends ServiceImpl implements Us return user; } - @Override - public boolean updatePwd(String userId, String nowPassword, String newPassword) { - User user = userMapper.selectById(userId); - if (user == null ||!user.getPassword().equals(nowPassword)) { - return false; - } - user.setPassword(newPassword); - return userMapper.updateById(user) > 0; - } - private List getUserMenus(List userRoles) { List list = new ArrayList<>(); // 获取用户所有的菜单 diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/util/AppUtils.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/util/AppUtils.java similarity index 98% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/util/AppUtils.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/util/AppUtils.java index 9f5d981..89a4c57 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/util/AppUtils.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/util/AppUtils.java @@ -1,4 +1,4 @@ -package ai.remi.sys.server.util; +package ai.remi.boot.server.util; import ai.remi.comm.exception.util.MessageUtils; import ai.remi.comm.redis.service.RedisService; @@ -6,7 +6,7 @@ import ai.remi.comm.util.asserts.AssertUtils; import ai.remi.comm.util.id.RandomUtils; import ai.remi.comm.util.id.UUIDUtils; import ai.remi.comm.util.security.AesUtils; -import ai.remi.sys.domain.enums.RedisKeyEnum; +import ai.remi.boot.domain.enums.RedisKeyEnum; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; diff --git a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/util/AuthUtils.java b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/util/AuthUtils.java similarity index 94% rename from remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/util/AuthUtils.java rename to remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/util/AuthUtils.java index c29aa2e..57a65c0 100644 --- a/remi-sys/remi-sys-server/src/main/java/ai/remi/sys/server/util/AuthUtils.java +++ b/remi-boot/remi-boot-server/src/main/java/ai/remi/boot/server/util/AuthUtils.java @@ -1,4 +1,4 @@ -package ai.remi.sys.server.util; +package ai.remi.boot.server.util; import ai.remi.comm.util.security.Base64Utils; import ai.remi.comm.util.string.StringUtils; diff --git a/remi-sys/remi-sys-web/pom.xml b/remi-boot/remi-boot-web/pom.xml similarity index 69% rename from remi-sys/remi-sys-web/pom.xml rename to remi-boot/remi-boot-web/pom.xml index 9e546ab..cbd1bf2 100644 --- a/remi-sys/remi-sys-web/pom.xml +++ b/remi-boot/remi-boot-web/pom.xml @@ -2,35 +2,35 @@ 4.0.0 - remi-sys-web - remi-sys-web - remi-sys-web + remi-boot-web + remi-boot-web + remi-boot-web - ai.remi.top.cloud - remi-sys - 3.1.1 + ai.remi.top.boot + remi-boot + 3.1.0 - - - - maven-releases - release - https://repository.njydsz.com/repository/maven-releases/ - - - maven-snapshots - snapshot - https://repository.njydsz.com/repository/maven-snapshots/ - - - org.springframework.boot spring-boot-starter-web + + + org.slf4j + slf4j-simple + + + org.slf4j + slf4j-nop + + + + + ch.qos.logback + logback-classic @@ -71,38 +71,34 @@ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-web - - ai.remi.top.cloud + + + + + ai.remi.top.boot + remi-boot-server - + - ai.remi.top.cloud - remi-sys-server + ai.remi.top.boot + remi-boot-job - + - ai.remi.top.cloud - remi-sys-job + ai.remi.top.boot + remi-boot-api - - - ai.remi.top.cloud - remi-sys-api - - - - ai.remi.top.cloud - remi-comm-feign - diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/Application.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/Application.java similarity index 78% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/Application.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/Application.java index cc7d3ed..744ed5e 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/Application.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/Application.java @@ -1,7 +1,6 @@ -package ai.remi.sys.web; +package ai.remi.boot.web; import ai.remi.comm.feign.annotation.EnableRemiFeignClients; -import ai.remi.comm.log.annotation.EnableLogRecord; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -11,7 +10,7 @@ import org.springframework.jmx.support.RegistrationPolicy; /** * 系统服务启动程序 */ -@EnableLogRecord +//@EnableLogRecord @EnableDiscoveryClient @EnableRemiFeignClients @SpringBootApplication(scanBasePackages = "ai.remi") @@ -19,10 +18,11 @@ import org.springframework.jmx.support.RegistrationPolicy; public class Application { public static void main(String[] args) { + //System.setProperty("cfg.env","local"); SpringApplication.run(Application.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ Remi SYS Web Startup Completed! ლ(´ڡ`ლ)ﾞ "); + System.out.println("(♥◠‿◠)ﾉﾞ Remi Boot Web Startup Completed! ლ(´ڡ`ლ)ﾞ "); } diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/AppController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/AppController.java similarity index 86% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/AppController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/AppController.java index d9f79ac..0e9af01 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/AppController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/AppController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -7,22 +7,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.bean.BeanCopyUtils; import ai.remi.comm.util.id.SnowflakeUtils; -import ai.remi.sys.domain.converter.AppConverter; -import ai.remi.sys.domain.converter.ConfigConverter; -import ai.remi.sys.domain.dto.post.AppPostDTO; -import ai.remi.sys.domain.dto.put.AppPutDTO; -import ai.remi.sys.domain.entity.App; -import ai.remi.sys.domain.entity.Config; -import ai.remi.sys.domain.query.AppQuery; -import ai.remi.sys.domain.vo.AppVO; -import ai.remi.sys.domain.vo.ConfigVO; -import ai.remi.sys.server.service.AppService; -import ai.remi.sys.server.service.ConfigService; -import ai.remi.sys.server.util.AppUtils; +import ai.remi.boot.domain.converter.AppConverter; +import ai.remi.boot.domain.converter.ConfigConverter; +import ai.remi.boot.domain.dto.post.AppPostDTO; +import ai.remi.boot.domain.dto.put.AppPutDTO; +import ai.remi.boot.domain.entity.App; +import ai.remi.boot.domain.entity.Config; +import ai.remi.boot.domain.query.AppQuery; +import ai.remi.boot.domain.vo.AppVO; +import ai.remi.boot.domain.vo.ConfigVO; +import ai.remi.boot.server.service.AppService; +import ai.remi.boot.server.service.ConfigService; +import ai.remi.boot.server.util.AppUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -114,7 +112,7 @@ public class AppController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "新增应用配置", businessType = BusinessType.INSERT) + //@LogRecord(content = "新增应用配置", businessType = BusinessType.INSERT) public ResultBean insert(@RequestBody @Validated AppPostDTO appDTO) { //处理格式转换 App app = AppConverter.INSTANT.postDtoToEntity(appDTO); @@ -152,7 +150,7 @@ public class AppController { */ @PutMapping("/update") @Operation(summary = "修改数据") - @LogRecord(content = "修改应用配置", businessType = BusinessType.UPDATE) + //@LogRecord(content = "修改应用配置", businessType = BusinessType.UPDATE) public ResultBean update(@RequestBody @Validated AppPutDTO appDTO) { //处理格式转换 App app = AppConverter.INSTANT.putDtoToEntity(appDTO); @@ -178,7 +176,7 @@ public class AppController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "删除应用数据", businessType = BusinessType.DELETE) + //@LogRecord(content = "删除应用数据", businessType = BusinessType.DELETE) public ResultBean delete(@RequestParam("ids") List ids) { return ResultBean.success(appService.removeByIds(ids)); } diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/AppGroupController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/AppGroupController.java similarity index 85% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/AppGroupController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/AppGroupController.java index f7f1e3c..6f51f6f 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/AppGroupController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/AppGroupController.java @@ -1,24 +1,22 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiSort; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.tree.TreeBuild; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.bean.BeanCopyUtils; import ai.remi.comm.util.collection.CollectionUtils; import ai.remi.comm.util.string.StringUtils; -import ai.remi.sys.domain.converter.AppGroupConverter; -import ai.remi.sys.domain.dto.post.AppGroupPostDTO; -import ai.remi.sys.domain.entity.AppGroup; -import ai.remi.sys.domain.entity.Group; -import ai.remi.sys.domain.query.AppGroupQuery; -import ai.remi.sys.domain.tree.GroupTree; -import ai.remi.sys.domain.vo.AppGroupVO; -import ai.remi.sys.server.service.AppGroupService; -import ai.remi.sys.server.service.GroupService; +import ai.remi.boot.domain.converter.AppGroupConverter; +import ai.remi.boot.domain.dto.post.AppGroupPostDTO; +import ai.remi.boot.domain.entity.AppGroup; +import ai.remi.boot.domain.entity.Group; +import ai.remi.boot.domain.query.AppGroupQuery; +import ai.remi.boot.domain.tree.GroupTree; +import ai.remi.boot.domain.vo.AppGroupVO; +import ai.remi.boot.server.service.AppGroupService; +import ai.remi.boot.server.service.GroupService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -101,7 +99,7 @@ public class AppGroupController { */ @PostMapping("/addOrUpdate") @Operation(summary = "给应用批量配置业务组织") - @LogRecord(content = "给应用批量配置业务组织", businessType = BusinessType.UPDATE) + //@LogRecord(content = "给应用批量配置业务组织", businessType = BusinessType.UPDATE) public ResultBean addOrUpdate(@RequestBody @Validated List appGroups) { //先删除后新增 appGroupService.remove(Wrappers.lambdaQuery().eq(AppGroup::getAppId, appGroups.get(0).getAppId())); diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/AppMenuController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/AppMenuController.java similarity index 83% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/AppMenuController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/AppMenuController.java index 7cc1560..6af13a6 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/AppMenuController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/AppMenuController.java @@ -1,24 +1,22 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.tree.TreeBuild; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.bean.BeanCopyUtils; import ai.remi.comm.util.collection.CollectionUtils; import ai.remi.comm.util.string.StringUtils; -import ai.remi.sys.domain.converter.AppMenuConverter; -import ai.remi.sys.domain.dto.post.AppMenuPostDTO; -import ai.remi.sys.domain.entity.App; -import ai.remi.sys.domain.entity.AppMenu; -import ai.remi.sys.domain.query.AppMenuQuery; -import ai.remi.sys.domain.tree.MenuTree; -import ai.remi.sys.domain.vo.AppMenuVO; -import ai.remi.sys.infra.mapper.MenuMapper; -import ai.remi.sys.server.service.AppMenuService; -import ai.remi.sys.server.service.AppService; +import ai.remi.boot.domain.converter.AppMenuConverter; +import ai.remi.boot.domain.dto.post.AppMenuPostDTO; +import ai.remi.boot.domain.entity.App; +import ai.remi.boot.domain.entity.AppMenu; +import ai.remi.boot.domain.query.AppMenuQuery; +import ai.remi.boot.domain.tree.MenuTree; +import ai.remi.boot.domain.vo.AppMenuVO; +import ai.remi.boot.infra.mapper.MenuMapper; +import ai.remi.boot.server.service.AppMenuService; +import ai.remi.boot.server.service.AppService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -97,7 +95,7 @@ public class AppMenuController { */ @PostMapping("/addOrUpdate") @Operation(summary = "给应用批量配置菜单") - @LogRecord(content = "给应用批量配置菜单", businessType = BusinessType.UPDATE) + //@LogRecord(content = "给应用批量配置菜单", businessType = BusinessType.UPDATE) public ResultBean addOrUpdate(@RequestBody @Validated List appMenuDTOs) { //先删除后新增 appMenuService.remove(Wrappers.lambdaQuery().eq(AppMenu::getAppId, appMenuDTOs.get(0).getAppId())); diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/AppPublishController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/AppPublishController.java similarity index 91% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/AppPublishController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/AppPublishController.java index 901360e..fc2cbaa 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/AppPublishController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/AppPublishController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -7,13 +7,13 @@ import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; import ai.remi.comm.util.bean.BeanCopyUtils; -import ai.remi.sys.domain.converter.AppPublishConverter; -import ai.remi.sys.domain.dto.post.AppPublishPostDTO; -import ai.remi.sys.domain.dto.put.AppPublishPutDTO; -import ai.remi.sys.domain.entity.AppPublish; -import ai.remi.sys.domain.query.AppPublishQuery; -import ai.remi.sys.domain.vo.AppPublishVO; -import ai.remi.sys.server.service.AppPublishService; +import ai.remi.boot.domain.converter.AppPublishConverter; +import ai.remi.boot.domain.dto.post.AppPublishPostDTO; +import ai.remi.boot.domain.dto.put.AppPublishPutDTO; +import ai.remi.boot.domain.entity.AppPublish; +import ai.remi.boot.domain.query.AppPublishQuery; +import ai.remi.boot.domain.vo.AppPublishVO; +import ai.remi.boot.server.service.AppPublishService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/AreaController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/AreaController.java similarity index 85% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/AreaController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/AreaController.java index ceeb111..388ea26 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/AreaController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/AreaController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -6,16 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.bean.BeanCopyUtils; -import ai.remi.sys.domain.converter.AreaConverter; -import ai.remi.sys.domain.dto.post.AreaPostDTO; -import ai.remi.sys.domain.dto.put.AreaPutDTO; -import ai.remi.sys.domain.entity.Area; -import ai.remi.sys.domain.query.AreaQuery; -import ai.remi.sys.domain.vo.AreaVO; -import ai.remi.sys.server.service.AreaService; +import ai.remi.boot.domain.converter.AreaConverter; +import ai.remi.boot.domain.dto.post.AreaPostDTO; +import ai.remi.boot.domain.dto.put.AreaPutDTO; +import ai.remi.boot.domain.entity.Area; +import ai.remi.boot.domain.query.AreaQuery; +import ai.remi.boot.domain.vo.AreaVO; +import ai.remi.boot.server.service.AreaService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -102,7 +100,7 @@ public class AreaController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "录入省市县信息", businessType = BusinessType.INSERT) + //@LogRecord(content = "录入省市县信息", businessType = BusinessType.INSERT) public ResultBean insert(@RequestBody @Validated AreaPostDTO areaDTO) { //处理格式转换 Area area = AreaConverter.INSTANT.postDtoToEntity(areaDTO); @@ -118,7 +116,7 @@ public class AreaController { */ @PutMapping("/update") @Operation(summary = "修改数据") - @LogRecord(content = "更新省市县信息", businessType = BusinessType.UPDATE) + //@LogRecord(content = "更新省市县信息", businessType = BusinessType.UPDATE) public ResultBean update(@RequestBody @Validated AreaPutDTO areaDTO) { //处理格式转换 Area area = AreaConverter.INSTANT.putDtoToEntity(areaDTO); @@ -134,7 +132,7 @@ public class AreaController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "删除省市县信息", businessType = BusinessType.DELETE) + //@LogRecord(content = "删除省市县信息", businessType = BusinessType.DELETE) public ResultBean delete(@RequestParam("ids") List ids) { return ResultBean.success(areaService.removeByIds(ids)); } diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/CompanyController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/CompanyController.java similarity index 87% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/CompanyController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/CompanyController.java index b1202f5..70569ad 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/CompanyController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/CompanyController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -6,22 +6,20 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.tree.TreeBuild; import ai.remi.comm.exception.util.MessageUtils; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.asserts.AssertUtils; import ai.remi.comm.util.bean.BeanCopyUtils; import ai.remi.comm.util.collection.CollectionUtils; import ai.remi.comm.util.string.StringUtils; -import ai.remi.sys.domain.converter.CompanyConverter; -import ai.remi.sys.domain.dto.post.CompanyPostDTO; -import ai.remi.sys.domain.dto.put.CompanyPutDTO; -import ai.remi.sys.domain.entity.Company; -import ai.remi.sys.domain.entity.CompanyDept; -import ai.remi.sys.domain.query.CompanyQuery; -import ai.remi.sys.domain.tree.CompanyTree; -import ai.remi.sys.domain.vo.CompanyVO; -import ai.remi.sys.server.service.CompanyDeptService; -import ai.remi.sys.server.service.CompanyService; +import ai.remi.boot.domain.converter.CompanyConverter; +import ai.remi.boot.domain.dto.post.CompanyPostDTO; +import ai.remi.boot.domain.dto.put.CompanyPutDTO; +import ai.remi.boot.domain.entity.Company; +import ai.remi.boot.domain.entity.CompanyDept; +import ai.remi.boot.domain.query.CompanyQuery; +import ai.remi.boot.domain.tree.CompanyTree; +import ai.remi.boot.domain.vo.CompanyVO; +import ai.remi.boot.server.service.CompanyDeptService; +import ai.remi.boot.server.service.CompanyService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -125,7 +123,7 @@ public class CompanyController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "新增公司数据", businessType = BusinessType.INSERT) + //@LogRecord(content = "新增公司数据", businessType = BusinessType.INSERT) public ResultBean insert(@RequestBody @Validated CompanyPostDTO companyDTO) { //处理格式转换 Company company = CompanyConverter.INSTANT.postDtoToEntity(companyDTO); @@ -141,7 +139,7 @@ public class CompanyController { */ @PutMapping("/update") @Operation(summary = "修改数据") - @LogRecord(content = "更新公司数据", businessType = BusinessType.UPDATE) + //@LogRecord(content = "更新公司数据", businessType = BusinessType.UPDATE) public ResultBean update(@RequestBody @Validated CompanyPutDTO companyDTO) { //处理格式转换 Company company = CompanyConverter.INSTANT.putDtoToEntity(companyDTO); @@ -157,7 +155,7 @@ public class CompanyController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "删除公司数据", businessType = BusinessType.DELETE) + //@LogRecord(content = "删除公司数据", businessType = BusinessType.DELETE) public ResultBean delete(@RequestParam("ids") List ids) { for (String id : ids) { Company company = companyService.getOne(Wrappers.lambdaQuery().eq(Company::getParentId, id).last("limit 1")); diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/ConfigController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/ConfigController.java similarity index 91% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/ConfigController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/ConfigController.java index a3d365e..fc2af80 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/ConfigController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/ConfigController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -9,16 +9,14 @@ import com.github.xiaoymin.knife4j.annotations.ApiSort; import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.auth.AuthInfoUtils; import ai.remi.comm.util.bean.BeanCopyUtils; -import ai.remi.sys.domain.converter.ConfigConverter; -import ai.remi.sys.domain.dto.post.ConfigPostDTO; -import ai.remi.sys.domain.entity.Config; -import ai.remi.sys.domain.query.ConfigQuery; -import ai.remi.sys.domain.vo.ConfigVO; -import ai.remi.sys.server.service.ConfigService; +import ai.remi.boot.domain.converter.ConfigConverter; +import ai.remi.boot.domain.dto.post.ConfigPostDTO; +import ai.remi.boot.domain.entity.Config; +import ai.remi.boot.domain.query.ConfigQuery; +import ai.remi.boot.domain.vo.ConfigVO; +import ai.remi.boot.server.service.ConfigService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.transaction.annotation.Transactional; @@ -100,7 +98,7 @@ public class ConfigController { */ @PostMapping("/operate") @Operation(summary = "保存配置") - @LogRecord(content = "保存全局配置", businessType = BusinessType.UPDATE) + //@LogRecord(content = "保存全局配置", businessType = BusinessType.UPDATE) @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") public ResultBean insert(@RequestBody @Validated List configPosts) { for (ConfigPostDTO configPost : configPosts) { diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/CordRoleController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/CordRoleController.java similarity index 86% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/CordRoleController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/CordRoleController.java index 2d3bb1e..7433ca6 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/CordRoleController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/CordRoleController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -8,21 +8,19 @@ import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; import ai.remi.comm.exception.util.MessageUtils; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.asserts.AssertUtils; import ai.remi.comm.util.bean.BeanCopyUtils; import ai.remi.comm.util.object.ObjectUtils; -import ai.remi.sys.domain.converter.CordRoleConverter; -import ai.remi.sys.domain.dto.post.CordRolePostDTO; -import ai.remi.sys.domain.entity.Company; -import ai.remi.sys.domain.entity.CordRole; -import ai.remi.sys.domain.entity.Dept; -import ai.remi.sys.domain.query.CordRoleQuery; -import ai.remi.sys.domain.vo.CordRoleVO; -import ai.remi.sys.server.service.CompanyService; -import ai.remi.sys.server.service.CordRoleService; -import ai.remi.sys.server.service.DeptService; +import ai.remi.boot.domain.converter.CordRoleConverter; +import ai.remi.boot.domain.dto.post.CordRolePostDTO; +import ai.remi.boot.domain.entity.Company; +import ai.remi.boot.domain.entity.CordRole; +import ai.remi.boot.domain.entity.Dept; +import ai.remi.boot.domain.query.CordRoleQuery; +import ai.remi.boot.domain.vo.CordRoleVO; +import ai.remi.boot.server.service.CompanyService; +import ai.remi.boot.server.service.CordRoleService; +import ai.remi.boot.server.service.DeptService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.transaction.annotation.Transactional; @@ -127,7 +125,7 @@ public class CordRoleController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "给组织角色批量分配组织（公司/部门）", businessType = BusinessType.GRANT) + //@LogRecord(content = "给组织角色批量分配组织（公司/部门）", businessType = BusinessType.GRANT) @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") public ResultBean insert(@RequestBody @Validated List cordRoleDTOs) { for (CordRolePostDTO cordRoleDTO : cordRoleDTOs) { @@ -149,7 +147,7 @@ public class CordRoleController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "批量删除组织角色已分配的组织（公司/部门）", businessType = BusinessType.GRANT) + //@LogRecord(content = "批量删除组织角色已分配的组织（公司/部门）", businessType = BusinessType.GRANT) public ResultBean delete(@RequestParam("ids") List ids) { return ResultBean.success(cordRoleService.removeByIds(ids)); } diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/DeptController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/DeptController.java similarity index 85% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/DeptController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/DeptController.java index eb79a89..9d1433d 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/DeptController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/DeptController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -6,27 +6,25 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.tree.TreeBuild; import ai.remi.comm.exception.util.MessageUtils; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.asserts.AssertUtils; import ai.remi.comm.util.collection.CollectionUtils; import ai.remi.comm.util.id.SnowflakeUtils; import ai.remi.comm.util.object.ObjectUtils; -import ai.remi.sys.domain.converter.DeptConverter; -import ai.remi.sys.domain.dto.post.DeptPostDTO; -import ai.remi.sys.domain.dto.put.DeptPutDTO; -import ai.remi.sys.domain.entity.CompanyDept; -import ai.remi.sys.domain.entity.Dept; -import ai.remi.sys.domain.entity.DeptUser; -import ai.remi.sys.domain.entity.User; -import ai.remi.sys.domain.query.DeptQuery; -import ai.remi.sys.domain.tree.DeptTree; -import ai.remi.sys.domain.vo.DeptVO; -import ai.remi.sys.infra.mapper.DeptMapper; -import ai.remi.sys.server.service.CompanyDeptService; -import ai.remi.sys.server.service.DeptService; -import ai.remi.sys.server.service.DeptUserService; -import ai.remi.sys.server.service.UserService; +import ai.remi.boot.domain.converter.DeptConverter; +import ai.remi.boot.domain.dto.post.DeptPostDTO; +import ai.remi.boot.domain.dto.put.DeptPutDTO; +import ai.remi.boot.domain.entity.CompanyDept; +import ai.remi.boot.domain.entity.Dept; +import ai.remi.boot.domain.entity.DeptUser; +import ai.remi.boot.domain.entity.User; +import ai.remi.boot.domain.query.DeptQuery; +import ai.remi.boot.domain.tree.DeptTree; +import ai.remi.boot.domain.vo.DeptVO; +import ai.remi.boot.infra.mapper.DeptMapper; +import ai.remi.boot.server.service.CompanyDeptService; +import ai.remi.boot.server.service.DeptService; +import ai.remi.boot.server.service.DeptUserService; +import ai.remi.boot.server.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.transaction.annotation.Transactional; @@ -122,7 +120,7 @@ public class DeptController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "添加部门数据", businessType = BusinessType.INSERT) + //@LogRecord(content = "添加部门数据", businessType = BusinessType.INSERT) @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") public ResultBean insert(@RequestBody @Validated DeptPostDTO deptDTO) { //处理格式转换 @@ -148,7 +146,7 @@ public class DeptController { */ @PutMapping("/update") @Operation(summary = "修改数据") - @LogRecord(content = "更新部门数据", businessType = BusinessType.UPDATE) + //@LogRecord(content = "更新部门数据", businessType = BusinessType.UPDATE) public ResultBean update(@RequestBody @Validated DeptPutDTO deptDTO) { //处理格式转换 Dept dept = DeptConverter.INSTANT.putDtoToEntity(deptDTO); @@ -164,7 +162,7 @@ public class DeptController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "删除部门数据", businessType = BusinessType.DELETE) + //@LogRecord(content = "删除部门数据", businessType = BusinessType.DELETE) public ResultBean delete(@RequestParam("ids") List ids) { for (String id : ids) { Dept dept = deptService.getOne(Wrappers.lambdaQuery().eq(Dept::getParentId, id).last("limit 1")); diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/DictController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/DictController.java similarity index 85% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/DictController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/DictController.java index 04109d8..b0190a8 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/DictController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/DictController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -6,16 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.bean.BeanCopyUtils; -import ai.remi.sys.domain.converter.DictConverter; -import ai.remi.sys.domain.dto.post.DictPostDTO; -import ai.remi.sys.domain.dto.put.DictPutDTO; -import ai.remi.sys.domain.entity.Dict; -import ai.remi.sys.domain.query.DictQuery; -import ai.remi.sys.domain.vo.DictVO; -import ai.remi.sys.server.service.DictService; +import ai.remi.boot.domain.converter.DictConverter; +import ai.remi.boot.domain.dto.post.DictPostDTO; +import ai.remi.boot.domain.dto.put.DictPutDTO; +import ai.remi.boot.domain.entity.Dict; +import ai.remi.boot.domain.query.DictQuery; +import ai.remi.boot.domain.vo.DictVO; +import ai.remi.boot.server.service.DictService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -102,7 +100,7 @@ public class DictController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "新增字典数据", businessType = BusinessType.INSERT) + //@LogRecord(content = "新增字典数据", businessType = BusinessType.INSERT) public ResultBean insert(@RequestBody @Validated DictPostDTO dictDTO) { //处理格式转换 Dict dict = DictConverter.INSTANT.postDtoToEntity(dictDTO); @@ -118,7 +116,7 @@ public class DictController { */ @PutMapping("/update") @Operation(summary = "修改数据") - @LogRecord(content = "修改字典数据", businessType = BusinessType.UPDATE) + //@LogRecord(content = "修改字典数据", businessType = BusinessType.UPDATE) public ResultBean update(@RequestBody @Validated DictPutDTO dictDTO) { //处理格式转换 Dict dict = DictConverter.INSTANT.putDtoToEntity(dictDTO); @@ -134,7 +132,7 @@ public class DictController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "删除字典树", businessType = BusinessType.DELETE) + //@LogRecord(content = "删除字典树", businessType = BusinessType.DELETE) public ResultBean delete(@RequestParam("ids") List ids) { return ResultBean.success(dictService.removeByIds(ids)); } diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/DictItemController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/DictItemController.java similarity index 85% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/DictItemController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/DictItemController.java index c61b231..8a9f22e 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/DictItemController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/DictItemController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -6,16 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.bean.BeanCopyUtils; -import ai.remi.sys.domain.converter.DictItemConverter; -import ai.remi.sys.domain.dto.post.DictItemPostDTO; -import ai.remi.sys.domain.dto.put.DictItemPutDTO; -import ai.remi.sys.domain.entity.DictItem; -import ai.remi.sys.domain.query.DictItemQuery; -import ai.remi.sys.domain.vo.DictItemVO; -import ai.remi.sys.server.service.DictItemService; +import ai.remi.boot.domain.converter.DictItemConverter; +import ai.remi.boot.domain.dto.post.DictItemPostDTO; +import ai.remi.boot.domain.dto.put.DictItemPutDTO; +import ai.remi.boot.domain.entity.DictItem; +import ai.remi.boot.domain.query.DictItemQuery; +import ai.remi.boot.domain.vo.DictItemVO; +import ai.remi.boot.server.service.DictItemService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -102,7 +100,7 @@ public class DictItemController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "新增字典项值", businessType = BusinessType.INSERT) + //@LogRecord(content = "新增字典项值", businessType = BusinessType.INSERT) public ResultBean insert(@RequestBody @Validated DictItemPostDTO dictItemDTO) { //处理格式转换 DictItem dictItem = DictItemConverter.INSTANT.postDtoToEntity(dictItemDTO); @@ -118,7 +116,7 @@ public class DictItemController { */ @PutMapping("/update") @Operation(summary = "修改数据") - @LogRecord(content = "修改字典项值", businessType = BusinessType.UPDATE) + //@LogRecord(content = "修改字典项值", businessType = BusinessType.UPDATE) public ResultBean update(@RequestBody @Validated DictItemPutDTO dictItemDTO) { //处理格式转换 DictItem dictItem = DictItemConverter.INSTANT.putDtoToEntity(dictItemDTO); @@ -134,7 +132,7 @@ public class DictItemController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "删除字典项值", businessType = BusinessType.DELETE) + //@LogRecord(content = "删除字典项值", businessType = BusinessType.DELETE) public ResultBean delete(@RequestParam("ids") List ids) { return ResultBean.success(dictItemService.removeByIds(ids)); } diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/GradeController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/GradeController.java similarity index 85% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/GradeController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/GradeController.java index cd62b3c..e0b84c9 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/GradeController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/GradeController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -6,16 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.bean.BeanCopyUtils; -import ai.remi.sys.domain.converter.GradeConverter; -import ai.remi.sys.domain.dto.post.GradePostDTO; -import ai.remi.sys.domain.dto.put.GradePutDTO; -import ai.remi.sys.domain.entity.Grade; -import ai.remi.sys.domain.query.GradeQuery; -import ai.remi.sys.domain.vo.GradeVO; -import ai.remi.sys.server.service.GradeService; +import ai.remi.boot.domain.converter.GradeConverter; +import ai.remi.boot.domain.dto.post.GradePostDTO; +import ai.remi.boot.domain.dto.put.GradePutDTO; +import ai.remi.boot.domain.entity.Grade; +import ai.remi.boot.domain.query.GradeQuery; +import ai.remi.boot.domain.vo.GradeVO; +import ai.remi.boot.server.service.GradeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -102,7 +100,7 @@ public class GradeController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "新增职系信息", businessType = BusinessType.INSERT) + //@LogRecord(content = "新增职系信息", businessType = BusinessType.INSERT) public ResultBean insert(@RequestBody @Validated GradePostDTO gradeDTO) { //处理格式转换 Grade grade = GradeConverter.INSTANT.postDtoToEntity(gradeDTO); @@ -118,7 +116,7 @@ public class GradeController { */ @PutMapping("/update") @Operation(summary = "修改数据") - @LogRecord(content = "修改职系信息", businessType = BusinessType.UPDATE) + //@LogRecord(content = "修改职系信息", businessType = BusinessType.UPDATE) public ResultBean update(@RequestBody @Validated GradePutDTO gradeDTO) { //处理格式转换 Grade grade = GradeConverter.INSTANT.putDtoToEntity(gradeDTO); @@ -134,7 +132,7 @@ public class GradeController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "删除职系信息", businessType = BusinessType.DELETE) + //@LogRecord(content = "删除职系信息", businessType = BusinessType.DELETE) public ResultBean delete(@RequestParam("ids") List ids) { return ResultBean.success(gradeService.removeByIds(ids)); } diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/GroupController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/GroupController.java similarity index 88% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/GroupController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/GroupController.java index 7d5b92a..4cf1eba 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/GroupController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/GroupController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -8,19 +8,17 @@ import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; import ai.remi.comm.domain.tree.TreeBuild; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.bean.BeanCopyUtils; import ai.remi.comm.util.collection.CollectionUtils; import ai.remi.comm.util.string.StringUtils; -import ai.remi.sys.domain.converter.GroupConverter; -import ai.remi.sys.domain.dto.post.GroupPostDTO; -import ai.remi.sys.domain.dto.put.GroupPutDTO; -import ai.remi.sys.domain.entity.Group; -import ai.remi.sys.domain.query.GroupQuery; -import ai.remi.sys.domain.tree.GroupTree; -import ai.remi.sys.domain.vo.GroupVO; -import ai.remi.sys.server.service.GroupService; +import ai.remi.boot.domain.converter.GroupConverter; +import ai.remi.boot.domain.dto.post.GroupPostDTO; +import ai.remi.boot.domain.dto.put.GroupPutDTO; +import ai.remi.boot.domain.entity.Group; +import ai.remi.boot.domain.query.GroupQuery; +import ai.remi.boot.domain.tree.GroupTree; +import ai.remi.boot.domain.vo.GroupVO; +import ai.remi.boot.server.service.GroupService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -132,7 +130,7 @@ public class GroupController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "新增用户组", businessType = BusinessType.INSERT) + //@LogRecord(content = "新增用户组", businessType = BusinessType.INSERT) public ResultBean insert(@RequestBody @Validated GroupPostDTO groupDTO) { //处理格式转换 Group group = GroupConverter.INSTANT.postDtoToEntity(groupDTO); @@ -148,7 +146,7 @@ public class GroupController { */ @PutMapping("/update") @Operation(summary = "修改数据") - @LogRecord(content = "修改用户组", businessType = BusinessType.UPDATE) + //@LogRecord(content = "修改用户组", businessType = BusinessType.UPDATE) public ResultBean update(@RequestBody @Validated GroupPutDTO groupDTO) { //处理格式转换 Group group = GroupConverter.INSTANT.putDtoToEntity(groupDTO); @@ -164,7 +162,7 @@ public class GroupController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "删除用户组", businessType = BusinessType.DELETE) + //@LogRecord(content = "删除用户组", businessType = BusinessType.DELETE) public ResultBean delete(@RequestParam("ids") List ids) { return ResultBean.success(groupService.removeByIds(ids)); } diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/GroupRoleController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/GroupRoleController.java similarity index 87% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/GroupRoleController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/GroupRoleController.java index 8db9828..d30daae 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/GroupRoleController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/GroupRoleController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -8,19 +8,17 @@ import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; import ai.remi.comm.exception.util.MessageUtils; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.asserts.AssertUtils; import ai.remi.comm.util.bean.BeanCopyUtils; import ai.remi.comm.util.object.ObjectUtils; -import ai.remi.sys.domain.converter.GroupRoleConverter; -import ai.remi.sys.domain.dto.post.GroupRolePostDTO; -import ai.remi.sys.domain.entity.Group; -import ai.remi.sys.domain.entity.GroupRole; -import ai.remi.sys.domain.query.GroupRoleQuery; -import ai.remi.sys.domain.vo.GroupRoleVO; -import ai.remi.sys.server.service.GroupRoleService; -import ai.remi.sys.server.service.GroupService; +import ai.remi.boot.domain.converter.GroupRoleConverter; +import ai.remi.boot.domain.dto.post.GroupRolePostDTO; +import ai.remi.boot.domain.entity.Group; +import ai.remi.boot.domain.entity.GroupRole; +import ai.remi.boot.domain.query.GroupRoleQuery; +import ai.remi.boot.domain.vo.GroupRoleVO; +import ai.remi.boot.server.service.GroupRoleService; +import ai.remi.boot.server.service.GroupService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.transaction.annotation.Transactional; @@ -118,7 +116,7 @@ public class GroupRoleController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "给用户组角色批量分配用户组", businessType = BusinessType.GRANT) + //@LogRecord(content = "给用户组角色批量分配用户组", businessType = BusinessType.GRANT) @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") public ResultBean insert(@RequestBody @Validated List groupRoleDTOs) { for (GroupRolePostDTO groupRoleDTO : groupRoleDTOs) { @@ -140,7 +138,7 @@ public class GroupRoleController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "批量删除用户组角色已分配的用户组", businessType = BusinessType.GRANT) + //@LogRecord(content = "批量删除用户组角色已分配的用户组", businessType = BusinessType.GRANT) public ResultBean delete(@RequestParam("ids") List ids) { return ResultBean.success(groupRoleService.removeByIds(ids)); } diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/GroupUserController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/GroupUserController.java similarity index 85% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/GroupUserController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/GroupUserController.java index b4ae593..37365ee 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/GroupUserController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/GroupUserController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -7,19 +7,17 @@ import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; import ai.remi.comm.exception.util.MessageUtils; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.asserts.AssertUtils; import ai.remi.comm.util.bean.BeanCopyUtils; import ai.remi.comm.util.object.ObjectUtils; -import ai.remi.sys.domain.converter.GroupUserConverter; -import ai.remi.sys.domain.dto.post.GroupUserPostDTO; -import ai.remi.sys.domain.entity.User; -import ai.remi.sys.domain.entity.GroupUser; -import ai.remi.sys.domain.query.GroupUserQuery; -import ai.remi.sys.domain.vo.GroupUserVO; -import ai.remi.sys.server.service.GroupUserService; -import ai.remi.sys.server.service.UserService; +import ai.remi.boot.domain.converter.GroupUserConverter; +import ai.remi.boot.domain.dto.post.GroupUserPostDTO; +import ai.remi.boot.domain.entity.User; +import ai.remi.boot.domain.entity.GroupUser; +import ai.remi.boot.domain.query.GroupUserQuery; +import ai.remi.boot.domain.vo.GroupUserVO; +import ai.remi.boot.server.service.GroupUserService; +import ai.remi.boot.server.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.transaction.annotation.Transactional; @@ -87,7 +85,7 @@ public class GroupUserController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "给用户组批量分配用户", businessType = BusinessType.GRANT) + //@LogRecord(content = "给用户组批量分配用户", businessType = BusinessType.GRANT) @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") public ResultBean insert(@RequestBody @Validated List groupUserDTOs) { for (GroupUserPostDTO groupUserDTO : groupUserDTOs) { @@ -109,7 +107,7 @@ public class GroupUserController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "批量删除用户组已分配的用户", businessType = BusinessType.GRANT) + //@LogRecord(content = "批量删除用户组已分配的用户", businessType = BusinessType.GRANT) public ResultBean delete(@RequestParam("ids") List ids) { return ResultBean.success(groupUserService.removeByIds(ids)); } diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/LogRecordController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/LogRecordController.java similarity index 94% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/LogRecordController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/LogRecordController.java index 1e5fd0a..5cc5f00 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/LogRecordController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/LogRecordController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -9,14 +9,14 @@ import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; import ai.remi.comm.util.bean.BeanCopyUtils; -import ai.remi.sys.domain.converter.LogRecordConverter; -import ai.remi.sys.domain.dto.post.LogRecordPostDTO; -import ai.remi.sys.domain.dto.put.LogRecordPutDTO; -import ai.remi.sys.domain.entity.LogRecord; -import ai.remi.sys.domain.query.LogRecordQuery; -import ai.remi.sys.domain.vo.LogRecordVO; -import ai.remi.sys.infra.mapper.UserMapper; -import ai.remi.sys.server.service.LogRecordService; +import ai.remi.boot.domain.converter.LogRecordConverter; +import ai.remi.boot.domain.dto.post.LogRecordPostDTO; +import ai.remi.boot.domain.dto.put.LogRecordPutDTO; +import ai.remi.boot.domain.entity.LogRecord; +import ai.remi.boot.domain.query.LogRecordQuery; +import ai.remi.boot.domain.vo.LogRecordVO; +import ai.remi.boot.infra.mapper.UserMapper; +import ai.remi.boot.server.service.LogRecordService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/LoginController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/LoginController.java similarity index 82% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/LoginController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/LoginController.java index ac6dfcb..8824d56 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/LoginController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/LoginController.java @@ -1,32 +1,30 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.exception.util.MessageUtils; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.redis.service.RedisService; import ai.remi.comm.util.asserts.AssertUtils; import ai.remi.comm.util.bean.BeanCopyUtils; import ai.remi.comm.util.id.UUIDUtils; import ai.remi.comm.util.object.ObjectUtils; import ai.remi.comm.util.string.StringUtils; -import ai.remi.sys.domain.constant.Oauth2Constant; -import ai.remi.sys.domain.constant.SsoConstant; -import ai.remi.sys.domain.converter.AccessTokenConverter; -import ai.remi.sys.domain.converter.OauthCodeConverter; -import ai.remi.sys.domain.dto.post.LoginPostDTO; -import ai.remi.sys.domain.dto.post.OauthCodePostDTO; -import ai.remi.sys.domain.entity.AccessToken; -import ai.remi.sys.domain.entity.OauthCode; -import ai.remi.sys.domain.entity.User; -import ai.remi.sys.domain.enums.RedisKeyEnum; -import ai.remi.sys.domain.vo.AccessTokenVO; -import ai.remi.sys.domain.vo.OauthCodeVO; -import ai.remi.sys.server.service.AccessTokenService; -import ai.remi.sys.server.service.OauthCodeService; -import ai.remi.sys.server.service.RefreshTokenService; -import ai.remi.sys.server.service.UserService; +import ai.remi.boot.domain.constant.Oauth2Constant; +import ai.remi.boot.domain.constant.SsoConstant; +import ai.remi.boot.domain.converter.AccessTokenConverter; +import ai.remi.boot.domain.converter.OauthCodeConverter; +import ai.remi.boot.domain.dto.post.LoginPostDTO; +import ai.remi.boot.domain.dto.post.OauthCodePostDTO; +import ai.remi.boot.domain.entity.AccessToken; +import ai.remi.boot.domain.entity.OauthCode; +import ai.remi.boot.domain.entity.User; +import ai.remi.boot.domain.enums.RedisKeyEnum; +import ai.remi.boot.domain.vo.AccessTokenVO; +import ai.remi.boot.domain.vo.OauthCodeVO; +import ai.remi.boot.server.service.AccessTokenService; +import ai.remi.boot.server.service.OauthCodeService; +import ai.remi.boot.server.service.RefreshTokenService; +import ai.remi.boot.server.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.*; @@ -67,7 +65,7 @@ public class LoginController { */ @GetMapping("/ticket") @Operation(summary = "根据Ticket登录") - @LogRecord(content = "通过Ticket登录系统", businessType = BusinessType.LOGIN) + //@LogRecord(content = "通过Ticket登录系统", businessType = BusinessType.LOGIN) public ResultBean ticketLogin( @RequestParam(value = SsoConstant.REDIRECT_URL) String redirectUrl, @RequestParam(value = Oauth2Constant.APP_KEY) String appKey, @@ -91,7 +89,7 @@ public class LoginController { */ @PostMapping("/other") @Operation(summary = "根据账号密码登录") - @LogRecord(content = "三方系统根据账号密码登录", businessType = BusinessType.LOGIN) + //@LogRecord(content = "三方系统根据账号密码登录", businessType = BusinessType.LOGIN) public ResultBean otherLogin( @RequestParam(value = SsoConstant.REDIRECT_URL) String redirectUrl, @RequestParam(value = Oauth2Constant.APP_KEY) String appKey, @@ -118,7 +116,7 @@ public class LoginController { */ @PostMapping("/local") @Operation(summary = "根据账号密码登录") - @LogRecord(content = "本地系统根据账号密码登录", businessType = BusinessType.LOGIN) + //@LogRecord(content = "本地系统根据账号密码登录", businessType = BusinessType.LOGIN) public ResultBean localLogin( @RequestParam(value = SsoConstant.REDIRECT_URL) String redirectUrl, @RequestParam(value = Oauth2Constant.APP_KEY) String appKey, diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/LogoutController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/LogoutController.java similarity index 81% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/LogoutController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/LogoutController.java index 97ee53e..002f62f 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/LogoutController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/LogoutController.java @@ -1,15 +1,13 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import ai.remi.comm.core.result.ResultBean; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.redis.service.RedisService; import ai.remi.comm.util.object.ObjectUtils; -import ai.remi.sys.domain.constant.Oauth2Constant; -import ai.remi.sys.domain.constant.SsoConstant; -import ai.remi.sys.domain.enums.RedisKeyEnum; -import ai.remi.sys.server.service.AccessTokenService; -import ai.remi.sys.server.service.RefreshTokenService; +import ai.remi.boot.domain.constant.Oauth2Constant; +import ai.remi.boot.domain.constant.SsoConstant; +import ai.remi.boot.domain.enums.RedisKeyEnum; +import ai.remi.boot.server.service.AccessTokenService; +import ai.remi.boot.server.service.RefreshTokenService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,7 +42,7 @@ public class LogoutController { */ @Operation(summary = "根据Ticket登出") @RequestMapping(method = RequestMethod.GET) - @LogRecord(content = "通过Ticket登出系统", businessType = BusinessType.LOGOUT) + //@LogRecord(content = "通过Ticket登出系统", businessType = BusinessType.LOGOUT) public ResultBean logout( @RequestParam(value = SsoConstant.REDIRECT_URL) String redirectUrl, @RequestParam(value = Oauth2Constant.CLIENT_TICKET) String ticket, diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/MenuController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/MenuController.java similarity index 83% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/MenuController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/MenuController.java index 0cc5626..6898fb3 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/MenuController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/MenuController.java @@ -1,27 +1,25 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.tree.TreeBuild; import ai.remi.comm.exception.util.MessageUtils; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.asserts.AssertUtils; import ai.remi.comm.util.collection.CollectionUtils; import ai.remi.comm.util.id.SnowflakeUtils; import ai.remi.comm.util.object.ObjectUtils; -import ai.remi.sys.domain.converter.MenuConverter; -import ai.remi.sys.domain.dto.post.MenuPostDTO; -import ai.remi.sys.domain.dto.put.MenuPutDTO; -import ai.remi.sys.domain.entity.AppMenu; -import ai.remi.sys.domain.entity.Menu; -import ai.remi.sys.domain.query.MenuQuery; -import ai.remi.sys.domain.tree.MenuTree; -import ai.remi.sys.domain.vo.MenuVO; -import ai.remi.sys.infra.mapper.MenuMapper; -import ai.remi.sys.server.service.AppMenuService; -import ai.remi.sys.server.service.MenuService; +import ai.remi.boot.domain.converter.MenuConverter; +import ai.remi.boot.domain.dto.post.MenuPostDTO; +import ai.remi.boot.domain.dto.put.MenuPutDTO; +import ai.remi.boot.domain.entity.AppMenu; +import ai.remi.boot.domain.entity.Menu; +import ai.remi.boot.domain.query.MenuQuery; +import ai.remi.boot.domain.tree.MenuTree; +import ai.remi.boot.domain.vo.MenuVO; +import ai.remi.boot.infra.mapper.MenuMapper; +import ai.remi.boot.server.service.AppMenuService; +import ai.remi.boot.server.service.MenuService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -95,7 +93,7 @@ public class MenuController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "新增菜单数据", businessType = BusinessType.INSERT) + //@LogRecord(content = "新增菜单数据", businessType = BusinessType.INSERT) public ResultBean insert(@RequestBody @Validated MenuPostDTO menuDTO) { //处理格式转换 Menu menu = MenuConverter.INSTANT.postDtoToEntity(menuDTO); @@ -120,7 +118,7 @@ public class MenuController { */ @PutMapping("/update") @Operation(summary = "修改数据") - @LogRecord(content = "修改菜单数据", businessType = BusinessType.UPDATE) + //@LogRecord(content = "修改菜单数据", businessType = BusinessType.UPDATE) public ResultBean update(@RequestBody @Validated MenuPutDTO menuDTO) { //处理格式转换 Menu menu = MenuConverter.INSTANT.putDtoToEntity(menuDTO); @@ -136,7 +134,7 @@ public class MenuController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "删除菜单数据", businessType = BusinessType.DELETE) + //@LogRecord(content = "删除菜单数据", businessType = BusinessType.DELETE) public ResultBean delete(@RequestParam("ids") List ids) { for (String id : ids) { //删除应用菜单中间表 diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/NoticeController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/NoticeController.java similarity index 92% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/NoticeController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/NoticeController.java index 67ead47..6820c1f 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/NoticeController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/NoticeController.java @@ -1,17 +1,17 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; import ai.remi.comm.util.bean.BeanCopyUtils; -import ai.remi.sys.domain.converter.NoticeConverter; -import ai.remi.sys.domain.dto.post.NoticePostDTO; -import ai.remi.sys.domain.dto.put.NoticePutDTO; -import ai.remi.sys.domain.entity.Notice; -import ai.remi.sys.domain.query.NoticeQuery; -import ai.remi.sys.domain.vo.NoticeVO; -import ai.remi.sys.server.service.NoticeService; +import ai.remi.boot.domain.converter.NoticeConverter; +import ai.remi.boot.domain.dto.post.NoticePostDTO; +import ai.remi.boot.domain.dto.put.NoticePutDTO; +import ai.remi.boot.domain.entity.Notice; +import ai.remi.boot.domain.query.NoticeQuery; +import ai.remi.boot.domain.vo.NoticeVO; +import ai.remi.boot.server.service.NoticeService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.xiaoymin.knife4j.annotations.ApiSort; diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/Oauth2Controller.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/Oauth2Controller.java similarity index 86% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/Oauth2Controller.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/Oauth2Controller.java index 6a399c3..f5c160e 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/Oauth2Controller.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/Oauth2Controller.java @@ -1,22 +1,20 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.exception.util.MessageUtils; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.redis.service.RedisService; import ai.remi.comm.util.asserts.AssertUtils; -import ai.remi.sys.domain.constant.Oauth2Constant; -import ai.remi.sys.domain.constant.SsoConstant; -import ai.remi.sys.domain.converter.AccessTokenConverter; -import ai.remi.sys.domain.entity.AccessToken; -import ai.remi.sys.domain.entity.OauthCode; -import ai.remi.sys.domain.enums.Oauth2TypeEnum; -import ai.remi.sys.domain.vo.AccessTokenVO; -import ai.remi.sys.server.service.AccessTokenService; -import ai.remi.sys.server.service.OauthCodeService; -import ai.remi.sys.server.service.RefreshTokenService; -import ai.remi.sys.server.util.AppUtils; +import ai.remi.boot.domain.constant.Oauth2Constant; +import ai.remi.boot.domain.constant.SsoConstant; +import ai.remi.boot.domain.converter.AccessTokenConverter; +import ai.remi.boot.domain.entity.AccessToken; +import ai.remi.boot.domain.entity.OauthCode; +import ai.remi.boot.domain.enums.Oauth2TypeEnum; +import ai.remi.boot.domain.vo.AccessTokenVO; +import ai.remi.boot.server.service.AccessTokenService; +import ai.remi.boot.server.service.OauthCodeService; +import ai.remi.boot.server.service.RefreshTokenService; +import ai.remi.boot.server.util.AppUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -68,7 +66,7 @@ public class Oauth2Controller { @Parameter(name = Oauth2Constant.APP_KEY, description = "应用的appKey", required = true), @Parameter(name = Oauth2Constant.APP_SECRET, description = "应用的appSecret", required = true) }) - @LogRecord(content = "通过authCode获取鉴权令牌", businessType = BusinessType.GRANT) + //@LogRecord(content = "通过authCode获取鉴权令牌", businessType = BusinessType.GRANT) public ResultBean getTokenByAuthCode(@RequestParam(value = Oauth2Constant.AUTH_TYPE) String authType, @RequestParam(value = Oauth2Constant.AUTH_CODE) String authCode, @RequestParam(value = Oauth2Constant.APP_KEY) String appKey, @@ -114,7 +112,7 @@ public class Oauth2Controller { @Parameter(name = Oauth2Constant.APP_SECRET, description = "应用的appSecret", required = true), @Parameter(name = Oauth2Constant.REFRESH_TOKEN, description = "刷新token", required = true) }) - @LogRecord(content = "通过refreshToken获取鉴权令牌", businessType = BusinessType.GRANT) + //@LogRecord(content = "通过refreshToken获取鉴权令牌", businessType = BusinessType.GRANT) public ResultBean getTokenByRefreshToken(@RequestParam(value = Oauth2Constant.APP_KEY) String appKey, @RequestParam(value = Oauth2Constant.APP_SECRET) String appSecret, @RequestParam(value = Oauth2Constant.REFRESH_TOKEN) String refreshToken) { @@ -152,7 +150,7 @@ public class Oauth2Controller { @Validated @GetMapping("/checkToken") @Operation(summary = "校验鉴权令牌") - @LogRecord(content = "校验鉴权令牌的有效性", businessType = BusinessType.GRANT) + //@LogRecord(content = "校验鉴权令牌的有效性", businessType = BusinessType.GRANT) public ResultBean checkToken(@RequestParam(value = Oauth2Constant.APP_KEY) String appKey, @RequestParam(value = Oauth2Constant.ACCESS_TOKEN) String accessToken) { diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/PositionController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/PositionController.java similarity index 85% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/PositionController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/PositionController.java index dda3834..7c6b075 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/PositionController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/PositionController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -6,16 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.bean.BeanCopyUtils; -import ai.remi.sys.domain.converter.PositionConverter; -import ai.remi.sys.domain.dto.post.PositionPostDTO; -import ai.remi.sys.domain.dto.put.PositionPutDTO; -import ai.remi.sys.domain.entity.Position; -import ai.remi.sys.domain.query.PositionQuery; -import ai.remi.sys.domain.vo.PositionVO; -import ai.remi.sys.server.service.PositionService; +import ai.remi.boot.domain.converter.PositionConverter; +import ai.remi.boot.domain.dto.post.PositionPostDTO; +import ai.remi.boot.domain.dto.put.PositionPutDTO; +import ai.remi.boot.domain.entity.Position; +import ai.remi.boot.domain.query.PositionQuery; +import ai.remi.boot.domain.vo.PositionVO; +import ai.remi.boot.server.service.PositionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -102,7 +100,7 @@ public class PositionController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "新增职位信息", businessType = BusinessType.INSERT) + //@LogRecord(content = "新增职位信息", businessType = BusinessType.INSERT) public ResultBean insert(@RequestBody @Validated PositionPostDTO positionDTO) { //处理格式转换 Position position = PositionConverter.INSTANT.postDtoToEntity(positionDTO); @@ -118,7 +116,7 @@ public class PositionController { */ @PutMapping("/update") @Operation(summary = "修改数据") - @LogRecord(content = "修改职位信息", businessType = BusinessType.UPDATE) + //@LogRecord(content = "修改职位信息", businessType = BusinessType.UPDATE) public ResultBean update(@RequestBody @Validated PositionPutDTO positionDTO) { //处理格式转换 Position position = PositionConverter.INSTANT.putDtoToEntity(positionDTO); @@ -134,7 +132,7 @@ public class PositionController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "删除职位信息", businessType = BusinessType.DELETE) + //@LogRecord(content = "删除职位信息", businessType = BusinessType.DELETE) public ResultBean delete(@RequestParam("ids") List ids) { return ResultBean.success(positionService.removeByIds(ids)); } diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/PostRoleController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/PostRoleController.java similarity index 87% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/PostRoleController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/PostRoleController.java index 05b027d..059f2b2 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/PostRoleController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/PostRoleController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -8,19 +8,17 @@ import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; import ai.remi.comm.exception.util.MessageUtils; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.asserts.AssertUtils; import ai.remi.comm.util.bean.BeanCopyUtils; import ai.remi.comm.util.object.ObjectUtils; -import ai.remi.sys.domain.converter.PostRoleConverter; -import ai.remi.sys.domain.dto.post.PostRolePostDTO; -import ai.remi.sys.domain.entity.PostRole; -import ai.remi.sys.domain.entity.Position; -import ai.remi.sys.domain.query.PostRoleQuery; -import ai.remi.sys.domain.vo.PostRoleVO; -import ai.remi.sys.server.service.PositionService; -import ai.remi.sys.server.service.PostRoleService; +import ai.remi.boot.domain.converter.PostRoleConverter; +import ai.remi.boot.domain.dto.post.PostRolePostDTO; +import ai.remi.boot.domain.entity.PostRole; +import ai.remi.boot.domain.entity.Position; +import ai.remi.boot.domain.query.PostRoleQuery; +import ai.remi.boot.domain.vo.PostRoleVO; +import ai.remi.boot.server.service.PositionService; +import ai.remi.boot.server.service.PostRoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.transaction.annotation.Transactional; @@ -116,7 +114,7 @@ public class PostRoleController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "给业务角色批量分配职位", businessType = BusinessType.GRANT) + //@LogRecord(content = "给业务角色批量分配职位", businessType = BusinessType.GRANT) @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") public ResultBean insert(@RequestBody @Validated List postRoleDTOs) { for (PostRolePostDTO postRoleDTO : postRoleDTOs) { @@ -138,7 +136,7 @@ public class PostRoleController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "批量删除业务角色已分配的职位", businessType = BusinessType.GRANT) + //@LogRecord(content = "批量删除业务角色已分配的职位", businessType = BusinessType.GRANT) public ResultBean delete(@RequestParam("ids") List ids) { return ResultBean.success(postRoleService.removeByIds(ids)); } diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/RankController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/RankController.java similarity index 85% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/RankController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/RankController.java index 4db6381..fadab73 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/RankController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/RankController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -6,16 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.bean.BeanCopyUtils; -import ai.remi.sys.domain.converter.RankConverter; -import ai.remi.sys.domain.dto.post.RankPostDTO; -import ai.remi.sys.domain.dto.put.RankPutDTO; -import ai.remi.sys.domain.entity.Rank; -import ai.remi.sys.domain.query.RankQuery; -import ai.remi.sys.domain.vo.RankVO; -import ai.remi.sys.server.service.RankService; +import ai.remi.boot.domain.converter.RankConverter; +import ai.remi.boot.domain.dto.post.RankPostDTO; +import ai.remi.boot.domain.dto.put.RankPutDTO; +import ai.remi.boot.domain.entity.Rank; +import ai.remi.boot.domain.query.RankQuery; +import ai.remi.boot.domain.vo.RankVO; +import ai.remi.boot.server.service.RankService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -102,7 +100,7 @@ public class RankController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "新增职级信息", businessType = BusinessType.INSERT) + //@LogRecord(content = "新增职级信息", businessType = BusinessType.INSERT) public ResultBean insert(@RequestBody @Validated RankPostDTO rankDTO) { //处理格式转换 Rank rank = RankConverter.INSTANT.postDtoToEntity(rankDTO); @@ -118,7 +116,7 @@ public class RankController { */ @PutMapping("/update") @Operation(summary = "修改数据") - @LogRecord(content = "修改职级信息", businessType = BusinessType.UPDATE) + //@LogRecord(content = "修改职级信息", businessType = BusinessType.UPDATE) public ResultBean update(@RequestBody @Validated RankPutDTO rankDTO) { //处理格式转换 Rank rank = RankConverter.INSTANT.putDtoToEntity(rankDTO); @@ -134,7 +132,7 @@ public class RankController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "删除职级信息", businessType = BusinessType.DELETE) + //@LogRecord(content = "删除职级信息", businessType = BusinessType.DELETE) public ResultBean delete(@RequestParam("ids") List ids) { return ResultBean.success(rankService.removeByIds(ids)); } diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/RestrictIpController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/RestrictIpController.java similarity index 86% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/RestrictIpController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/RestrictIpController.java index e8cdf5c..03395e4 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/RestrictIpController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/RestrictIpController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -6,16 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.bean.BeanCopyUtils; -import ai.remi.sys.domain.converter.RestrictIpConverter; -import ai.remi.sys.domain.dto.post.RestrictIpPostDTO; -import ai.remi.sys.domain.dto.put.RestrictIpPutDTO; -import ai.remi.sys.domain.entity.RestrictIp; -import ai.remi.sys.domain.query.RestrictIpQuery; -import ai.remi.sys.domain.vo.RestrictIpVO; -import ai.remi.sys.server.service.RestrictIpService; +import ai.remi.boot.domain.converter.RestrictIpConverter; +import ai.remi.boot.domain.dto.post.RestrictIpPostDTO; +import ai.remi.boot.domain.dto.put.RestrictIpPutDTO; +import ai.remi.boot.domain.entity.RestrictIp; +import ai.remi.boot.domain.query.RestrictIpQuery; +import ai.remi.boot.domain.vo.RestrictIpVO; +import ai.remi.boot.server.service.RestrictIpService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -102,7 +100,7 @@ public class RestrictIpController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "录入黑白名单", businessType = BusinessType.INSERT) + //@LogRecord(content = "录入黑白名单", businessType = BusinessType.INSERT) public ResultBean insert(@RequestBody @Validated RestrictIpPostDTO restrictIpDTO) { //处理格式转换 RestrictIp restrictIp = RestrictIpConverter.INSTANT.postDtoToEntity(restrictIpDTO); @@ -118,7 +116,7 @@ public class RestrictIpController { */ @PutMapping("/update") @Operation(summary = "修改数据") - @LogRecord(content = "更新黑白名单", businessType = BusinessType.UPDATE) + //@LogRecord(content = "更新黑白名单", businessType = BusinessType.UPDATE) public ResultBean update(@RequestBody @Validated RestrictIpPutDTO restrictIpDTO) { //处理格式转换 RestrictIp restrictIp = RestrictIpConverter.INSTANT.putDtoToEntity(restrictIpDTO); @@ -134,7 +132,7 @@ public class RestrictIpController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "删除黑白名单", businessType = BusinessType.DELETE) + //@LogRecord(content = "删除黑白名单", businessType = BusinessType.DELETE) public ResultBean delete(@RequestParam("ids") List ids) { return ResultBean.success(restrictIpService.removeByIds(ids)); } diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/RoleController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/RoleController.java similarity index 85% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/RoleController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/RoleController.java index ca3f3aa..37b2f81 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/RoleController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/RoleController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -6,16 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.bean.BeanCopyUtils; -import ai.remi.sys.domain.converter.RoleConverter; -import ai.remi.sys.domain.dto.post.RolePostDTO; -import ai.remi.sys.domain.dto.put.RolePutDTO; -import ai.remi.sys.domain.entity.Role; -import ai.remi.sys.domain.query.RoleQuery; -import ai.remi.sys.domain.vo.RoleVO; -import ai.remi.sys.server.service.RoleService; +import ai.remi.boot.domain.converter.RoleConverter; +import ai.remi.boot.domain.dto.post.RolePostDTO; +import ai.remi.boot.domain.dto.put.RolePutDTO; +import ai.remi.boot.domain.entity.Role; +import ai.remi.boot.domain.query.RoleQuery; +import ai.remi.boot.domain.vo.RoleVO; +import ai.remi.boot.server.service.RoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -102,7 +100,7 @@ public class RoleController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "新增角色信息", businessType = BusinessType.INSERT) + //@LogRecord(content = "新增角色信息", businessType = BusinessType.INSERT) public ResultBean insert(@RequestBody @Validated RolePostDTO roleDTO) { //处理格式转换 Role role = RoleConverter.INSTANT.postDtoToEntity(roleDTO); @@ -118,7 +116,7 @@ public class RoleController { */ @PutMapping("/update") @Operation(summary = "修改数据") - @LogRecord(content = "更新角色信息", businessType = BusinessType.UPDATE) + //@LogRecord(content = "更新角色信息", businessType = BusinessType.UPDATE) public ResultBean update(@RequestBody @Validated RolePutDTO roleDTO) { //处理格式转换 Role role = RoleConverter.INSTANT.putDtoToEntity(roleDTO); @@ -134,7 +132,7 @@ public class RoleController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "删除角色信息", businessType = BusinessType.DELETE) + //@LogRecord(content = "删除角色信息", businessType = BusinessType.DELETE) public ResultBean delete(@RequestParam("ids") List ids) { return ResultBean.success(roleService.removeByIds(ids)); } diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/RoleMenuController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/RoleMenuController.java similarity index 87% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/RoleMenuController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/RoleMenuController.java index db3b32a..ef7046a 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/RoleMenuController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/RoleMenuController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -7,17 +7,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.bean.BeanCopyUtils; -import ai.remi.sys.domain.converter.RoleMenuConverter; -import ai.remi.sys.domain.dto.post.RoleMenuPostDTO; -import ai.remi.sys.domain.entity.Menu; -import ai.remi.sys.domain.entity.RoleMenu; -import ai.remi.sys.domain.query.RoleMenuQuery; -import ai.remi.sys.domain.vo.RoleMenuVO; -import ai.remi.sys.server.service.MenuService; -import ai.remi.sys.server.service.RoleMenuService; +import ai.remi.boot.domain.converter.RoleMenuConverter; +import ai.remi.boot.domain.dto.post.RoleMenuPostDTO; +import ai.remi.boot.domain.entity.Menu; +import ai.remi.boot.domain.entity.RoleMenu; +import ai.remi.boot.domain.query.RoleMenuQuery; +import ai.remi.boot.domain.vo.RoleMenuVO; +import ai.remi.boot.server.service.MenuService; +import ai.remi.boot.server.service.RoleMenuService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -114,7 +112,7 @@ public class RoleMenuController { */ @PostMapping("/addOrUpdate") @Operation(summary = "给角色批量授权菜单") - @LogRecord(content = "给角色批量授权菜单", businessType = BusinessType.GRANT) + //@LogRecord(content = "给角色批量授权菜单", businessType = BusinessType.GRANT) public ResultBean addOrUpdate(@RequestBody @Validated List roleMenuDTOs) { //先删除后新增 roleMenuService.remove(Wrappers.lambdaQuery().eq(RoleMenu::getRoleId, roleMenuDTOs.get(0).getRoleId())); diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/UserController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/UserController.java similarity index 80% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/UserController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/UserController.java index f1a4297..490c889 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/UserController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/UserController.java @@ -1,32 +1,30 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; import ai.remi.comm.exception.util.MessageUtils; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.redis.service.RedisService; import ai.remi.comm.util.asserts.AssertUtils; import ai.remi.comm.util.collection.CollectionUtils; import ai.remi.comm.util.id.SnowflakeUtils; -import ai.remi.sys.domain.converter.UserConverter; -import ai.remi.sys.domain.dto.post.UserPostDTO; -import ai.remi.sys.domain.dto.put.UserPutDTO; -import ai.remi.sys.domain.entity.DeptUser; -import ai.remi.sys.domain.entity.User; -import ai.remi.sys.domain.entity.UserPost; -import ai.remi.sys.domain.enums.RedisKeyEnum; -import ai.remi.sys.domain.query.UserQuery; -import ai.remi.sys.domain.vo.UserVO; -import ai.remi.sys.infra.mapper.UserMapper; -import ai.remi.sys.server.service.DeptUserService; -import ai.remi.sys.server.service.UserPostService; -import ai.remi.sys.server.service.UserService; -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import ai.remi.boot.domain.converter.UserConverter; +import ai.remi.boot.domain.dto.post.UserPostDTO; +import ai.remi.boot.domain.dto.put.UserPutDTO; +import ai.remi.boot.domain.entity.DeptUser; +import ai.remi.boot.domain.entity.User; +import ai.remi.boot.domain.entity.UserPost; +import ai.remi.boot.domain.enums.RedisKeyEnum; +import ai.remi.boot.domain.query.UserQuery; +import ai.remi.boot.domain.vo.UserVO; +import ai.remi.boot.infra.mapper.UserMapper; +import ai.remi.boot.server.service.DeptUserService; +import ai.remi.boot.server.service.UserPostService; +import ai.remi.boot.server.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.transaction.annotation.Transactional; @@ -131,7 +129,7 @@ public class UserController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "录入用户信息", businessType = BusinessType.INSERT) + //@LogRecord(content = "录入用户信息", businessType = BusinessType.INSERT) @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") public ResultBean insert(@RequestBody @Validated UserPostDTO userDTO) { //处理格式转换 @@ -153,24 +151,6 @@ public class UserController { return ResultBean.success(userService.save(user)); } - /** - * 更新密码 - * - * @return 修改结果 - */ - @PutMapping("/updatePwd") - @Operation(summary = "更新密码") - @LogRecord(content = "修改用户密码", businessType = BusinessType.UPDATE) - @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") - public ResultBean updatePwd(@RequestParam("userId") String userId, - @RequestParam("nowPassword") String nowPassword, - @RequestParam("newPassword") String newPassword) { - //执行数据更新 - boolean updated = userService.updatePwd(userId, nowPassword, newPassword); - AssertUtils.isTrue(updated, MessageUtils.getMessage("update.user.pwd.error")); - return ResultBean.success("更新密码成功！"); - } - /** * 修改数据 * @@ -179,7 +159,7 @@ public class UserController { */ @PutMapping("/update") @Operation(summary = "修改数据") - @LogRecord(content = "更新用户信息", businessType = BusinessType.UPDATE) + //@LogRecord(content = "更新用户信息", businessType = BusinessType.UPDATE) @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") public ResultBean update(@RequestBody @Validated UserPutDTO userDTO) { //处理格式转换 @@ -208,7 +188,7 @@ public class UserController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "删除用户信息", businessType = BusinessType.DELETE) + //@LogRecord(content = "删除用户信息", businessType = BusinessType.DELETE) @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") public ResultBean delete(@RequestParam("ids") List ids) { for (String id : ids) { @@ -221,5 +201,6 @@ public class UserController { } return ResultBean.success(userService.removeByIds(ids)); } + } diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/UserRoleController.java b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/UserRoleController.java similarity index 87% rename from remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/UserRoleController.java rename to remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/UserRoleController.java index b0834da..73afc23 100644 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/UserRoleController.java +++ b/remi-boot/remi-boot-web/src/main/java/ai/remi/boot/web/controller/UserRoleController.java @@ -1,4 +1,4 @@ -package ai.remi.sys.web.controller; +package ai.remi.boot.web.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -8,19 +8,17 @@ import ai.remi.comm.core.result.PagerBean; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.domain.query.PageQuery; import ai.remi.comm.exception.util.MessageUtils; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; import ai.remi.comm.util.asserts.AssertUtils; import ai.remi.comm.util.bean.BeanCopyUtils; import ai.remi.comm.util.object.ObjectUtils; -import ai.remi.sys.domain.converter.UserRoleConverter; -import ai.remi.sys.domain.dto.post.UserRolePostDTO; -import ai.remi.sys.domain.entity.User; -import ai.remi.sys.domain.entity.UserRole; -import ai.remi.sys.domain.query.UserRoleQuery; -import ai.remi.sys.domain.vo.UserRoleVO; -import ai.remi.sys.server.service.UserRoleService; -import ai.remi.sys.server.service.UserService; +import ai.remi.boot.domain.converter.UserRoleConverter; +import ai.remi.boot.domain.dto.post.UserRolePostDTO; +import ai.remi.boot.domain.entity.User; +import ai.remi.boot.domain.entity.UserRole; +import ai.remi.boot.domain.query.UserRoleQuery; +import ai.remi.boot.domain.vo.UserRoleVO; +import ai.remi.boot.server.service.UserRoleService; +import ai.remi.boot.server.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.transaction.annotation.Transactional; @@ -115,7 +113,7 @@ public class UserRoleController { */ @PostMapping("/add") @Operation(summary = "新增数据") - @LogRecord(content = "给基础角色批量分配用户", businessType = BusinessType.GRANT) + //@LogRecord(content = "给基础角色批量分配用户", businessType = BusinessType.GRANT) @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") public ResultBean insert(@RequestBody @Validated List userRoleDTOs) { for (UserRolePostDTO userRoleDTO : userRoleDTOs) { @@ -137,7 +135,7 @@ public class UserRoleController { */ @DeleteMapping("/delete") @Operation(summary = "删除数据") - @LogRecord(content = "批量删除基础角色已分配的用户", businessType = BusinessType.GRANT) + //@LogRecord(content = "批量删除基础角色已分配的用户", businessType = BusinessType.GRANT) public ResultBean delete(@RequestParam("ids") List ids) { return ResultBean.success(userRoleService.removeByIds(ids)); } diff --git a/remi-sys/remi-sys-web/src/main/resources/bootstrap.yml b/remi-boot/remi-boot-web/src/main/resources/bootstrap.yml similarity index 98% rename from remi-sys/remi-sys-web/src/main/resources/bootstrap.yml rename to remi-boot/remi-boot-web/src/main/resources/bootstrap.yml index 8499577..19a4280 100644 --- a/remi-sys/remi-sys-web/src/main/resources/bootstrap.yml +++ b/remi-boot/remi-boot-web/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: spring: application: - name: remi-sys-web + name: remi-boot-web profiles: active: dev #active: sit diff --git a/remi-sys/remi-sys-web/src/main/resources/docker/Dockerfile b/remi-boot/remi-boot-web/src/main/resources/docker/Dockerfile similarity index 87% rename from remi-sys/remi-sys-web/src/main/resources/docker/Dockerfile rename to remi-boot/remi-boot-web/src/main/resources/docker/Dockerfile index 50eb359..8da89ca 100644 --- a/remi-sys/remi-sys-web/src/main/resources/docker/Dockerfile +++ b/remi-boot/remi-boot-web/src/main/resources/docker/Dockerfile @@ -8,15 +8,15 @@ VOLUME /temp #ADD 将app.jar文件将拷贝到容器中，默认拷贝到根路径下 #也可以直接写成ADD app.jar /app.jar 或者 ADD app.jar / -ADD remi-sys-web-3.1.0.jar remi-sys-web.jar +ADD remi-boot-web-3.1.0.jar remi-boot-web.jar #修改app.jar这个文件的访问时间和修改时间为当前时间，而不会修改文件的内容。 -RUN bash -c "touch /remi-sys-web.jar" +RUN bash -c "touch /remi-boot-web.jar" #ENTRYPOINT 应用启动命令 参数设定 #由于tomcat的session id的生成主要通过java.security.SecureRandom生成随机数来实现，导致启动过程很慢 #通过-Djava.security.egd=file:/dev/./urandom参数可以加快随机数产生过程 -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/remi-sys-web.jar"] +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/remi-boot-web.jar"] #EXPOSE 容器暴露端口 EXPOSE 1010 diff --git a/remi-sys/remi-sys-app/src/main/resources/docker/README.md b/remi-boot/remi-boot-web/src/main/resources/docker/README.md similarity index 76% rename from remi-sys/remi-sys-app/src/main/resources/docker/README.md rename to remi-boot/remi-boot-web/src/main/resources/docker/README.md index e5bbdd4..b75d8ca 100644 --- a/remi-sys/remi-sys-app/src/main/resources/docker/README.md +++ b/remi-boot/remi-boot-web/src/main/resources/docker/README.md @@ -3,5 +3,5 @@ ```shell sh ./docker_deploy.sh -docker logs -f dev-remi-sys-app +docker logs -f remi-boot-web ``` diff --git a/remi-boot/remi-boot-web/src/main/resources/docker/docker_deploy.sh b/remi-boot/remi-boot-web/src/main/resources/docker/docker_deploy.sh new file mode 100644 index 0000000..2738273 --- /dev/null +++ b/remi-boot/remi-boot-web/src/main/resources/docker/docker_deploy.sh @@ -0,0 +1,12 @@ +#先删除原有的镜像 +docker images | grep remi-boot-web | awk '{print $3}' | xargs docker rmi -f +docker build -t remi-boot-web . +docker images | grep remi-boot-web +#把新镜像推送到私服 +docker login -uadmin -pRemi123 harbor.******.com +docker tag remi-boot-web harbor.******.com/remi-top/remi-boot-web:3.1.0 +docker tag remi-boot-web harbor.******.com/remi-top/remi-boot-web +docker push harbor.******.com/remi-top/remi-boot-web:3.1.0 +docker push harbor.******.com/remi-top/remi-boot-web +#基于Docker启动容器 +docker run --restart=always -t -dit -p 1010:1010 --name remi-boot-web harbor.******.com/remi-top/remi-boot-web diff --git a/remi-sys/remi-sys-web/src/main/resources/i18n/messages_en_US.properties b/remi-boot/remi-boot-web/src/main/resources/i18n/messages_en_US.properties similarity index 94% rename from remi-sys/remi-sys-web/src/main/resources/i18n/messages_en_US.properties rename to remi-boot/remi-boot-web/src/main/resources/i18n/messages_en_US.properties index 20c5bc1..a640140 100644 --- a/remi-sys/remi-sys-web/src/main/resources/i18n/messages_en_US.properties +++ b/remi-boot/remi-boot-web/src/main/resources/i18n/messages_en_US.properties @@ -21,7 +21,6 @@ add.roleCord.error=The same cord {0} already exists? add.rolePost.error=The same post {0} already exists? add.roleGroup.error=The same group {0} already exists? check.login.error=The username or password is wrong, please check and try again! -update.user.pwd.error=Exception when updating user password, please check and try again! #****************************????**************************** other.system.error=Other system error call.feign.error=Call feign error diff --git a/remi-sys/remi-sys-web/src/main/resources/i18n/messages_zh_CN.properties b/remi-boot/remi-boot-web/src/main/resources/i18n/messages_zh_CN.properties similarity index 96% rename from remi-sys/remi-sys-web/src/main/resources/i18n/messages_zh_CN.properties rename to remi-boot/remi-boot-web/src/main/resources/i18n/messages_zh_CN.properties index 7fc4129..76a2df1 100644 --- a/remi-sys/remi-sys-web/src/main/resources/i18n/messages_zh_CN.properties +++ b/remi-boot/remi-boot-web/src/main/resources/i18n/messages_zh_CN.properties @@ -22,7 +22,6 @@ add.roleCord.error=当前角色下已存在该组织，请检查组织:{0}！ add.rolePost.error=当前角色下已存在该岗位，请检查岗位:{0}！ add.roleGroup.error=当前角色下已存在该用户组，请检查用户组:{0}！ check.login.error=用户名或密码错误，请检查后重试！ -update.user.pwd.error=更新用户密码异常，请检查后重试！ #****************************三方异常**************************** other.system.error=三方系统异常 call.feign.error=调用Feign异常 diff --git a/remi-sys/remi-sys-web/src/main/resources/k8s/Dockerfile b/remi-boot/remi-boot-web/src/main/resources/k8s/Dockerfile similarity index 87% rename from remi-sys/remi-sys-web/src/main/resources/k8s/Dockerfile rename to remi-boot/remi-boot-web/src/main/resources/k8s/Dockerfile index 50eb359..8da89ca 100644 --- a/remi-sys/remi-sys-web/src/main/resources/k8s/Dockerfile +++ b/remi-boot/remi-boot-web/src/main/resources/k8s/Dockerfile @@ -8,15 +8,15 @@ VOLUME /temp #ADD 将app.jar文件将拷贝到容器中，默认拷贝到根路径下 #也可以直接写成ADD app.jar /app.jar 或者 ADD app.jar / -ADD remi-sys-web-3.1.0.jar remi-sys-web.jar +ADD remi-boot-web-3.1.0.jar remi-boot-web.jar #修改app.jar这个文件的访问时间和修改时间为当前时间，而不会修改文件的内容。 -RUN bash -c "touch /remi-sys-web.jar" +RUN bash -c "touch /remi-boot-web.jar" #ENTRYPOINT 应用启动命令 参数设定 #由于tomcat的session id的生成主要通过java.security.SecureRandom生成随机数来实现，导致启动过程很慢 #通过-Djava.security.egd=file:/dev/./urandom参数可以加快随机数产生过程 -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/remi-sys-web.jar"] +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/remi-boot-web.jar"] #EXPOSE 容器暴露端口 EXPOSE 1010 diff --git a/remi-sys/remi-sys-app/src/main/resources/k8s/README.md b/remi-boot/remi-boot-web/src/main/resources/k8s/README.md similarity index 57% rename from remi-sys/remi-sys-app/src/main/resources/k8s/README.md rename to remi-boot/remi-boot-web/src/main/resources/k8s/README.md index 577c796..4d1b51c 100644 --- a/remi-sys/remi-sys-app/src/main/resources/k8s/README.md +++ b/remi-boot/remi-boot-web/src/main/resources/k8s/README.md @@ -7,7 +7,7 @@ sh ./k8s_deploy.sh kubectl get pods -n remi-top -kubectl describe pod dev-remi-sys-app -n remi-top +kubectl describe pod remi-boot-web -n remi-top -kubectl get deployment dev-remi-sys-app -n remi-top -o yaml +kubectl get deployment remi-boot-web -n remi-top -o yaml ``` diff --git a/remi-sys/remi-sys-web/src/main/resources/k8s/dev-remi-sys-web.yaml b/remi-boot/remi-boot-web/src/main/resources/k8s/dev-remi-sys-web.yaml similarity index 79% rename from remi-sys/remi-sys-web/src/main/resources/k8s/dev-remi-sys-web.yaml rename to remi-boot/remi-boot-web/src/main/resources/k8s/dev-remi-sys-web.yaml index 341174c..f95af03 100644 --- a/remi-sys/remi-sys-web/src/main/resources/k8s/dev-remi-sys-web.yaml +++ b/remi-boot/remi-boot-web/src/main/resources/k8s/dev-remi-sys-web.yaml @@ -2,41 +2,41 @@ apiVersion: v1 kind: Service metadata: - name: dev-remi-sys-web + name: remi-boot-web labels: - app: dev-remi-sys-web + app: remi-boot-web spec: type: NodePort ports: - - name: dev-remi-sys-web + - name: remi-boot-web port: 1010 protocol: TCP targetPort: 1010 nodePort: 30010 selector: - app: dev-remi-sys-web + app: remi-boot-web --- ## Deployment apiVersion: apps/v1 kind: Deployment metadata: - name: dev-remi-sys-web + name: remi-boot-web labels: - app: dev-remi-sys-web + app: remi-boot-web spec: replicas: 2 selector: matchLabels: - app: dev-remi-sys-web + app: remi-boot-web template: metadata: labels: - app: dev-remi-sys-web + app: remi-boot-web spec: containers: - - image: harbor.******.com/remi-top/dev-remi-sys-web + - image: harbor.******.com/remi-top/remi-boot-web imagePullPolicy: Always - name: dev-remi-sys-web + name: remi-boot-web ports: - containerPort: 1010 protocol: TCP diff --git a/remi-boot/remi-boot-web/src/main/resources/k8s/docker_deploy.sh b/remi-boot/remi-boot-web/src/main/resources/k8s/docker_deploy.sh new file mode 100644 index 0000000..bc31f28 --- /dev/null +++ b/remi-boot/remi-boot-web/src/main/resources/k8s/docker_deploy.sh @@ -0,0 +1,10 @@ +#先删除原有的镜像 +docker images | grep remi-boot-web | awk '{print $3}' | xargs docker rmi -f +docker build -t remi-boot-web . +docker images | grep remi-boot-web +#把新镜像推送到私服 +docker login -uadmin -pRemi123 harbor.******.com +docker tag remi-boot-web harbor.******.com/remi-top/remi-boot-web:3.1.0 +docker tag remi-boot-web harbor.******.com/remi-top/remi-boot-web +docker push harbor.******.com/remi-top/remi-boot-web:3.1.0 +docker push harbor.******.com/remi-top/remi-boot-web diff --git a/remi-boot/remi-boot-web/src/main/resources/k8s/k8s_deploy.sh b/remi-boot/remi-boot-web/src/main/resources/k8s/k8s_deploy.sh new file mode 100644 index 0000000..a3a305c --- /dev/null +++ b/remi-boot/remi-boot-web/src/main/resources/k8s/k8s_deploy.sh @@ -0,0 +1,5 @@ +#先删除原有的Pod +kubectl delete deployment remi-boot-web -n remi-top --grace-period=0 --force +kubectl delete svc remi-boot-web -n remi-top +#启动新的Pod +kubectl create -f remi-boot-web.yaml -n remi-top \ No newline at end of file diff --git a/remi-sys/remi-sys-web/src/main/resources/logback-spring.xml b/remi-boot/remi-boot-web/src/main/resources/logback-spring.xml similarity index 93% rename from remi-sys/remi-sys-web/src/main/resources/logback-spring.xml rename to remi-boot/remi-boot-web/src/main/resources/logback-spring.xml index 4448db1..dac08c4 100644 --- a/remi-sys/remi-sys-web/src/main/resources/logback-spring.xml +++ b/remi-boot/remi-boot-web/src/main/resources/logback-spring.xml @@ -36,7 +36,7 @@ ${logDir}/debug.log - ${logDir}/debug-%d{yyyy-MM-dd}-%i.log + ${logDir}/%d{yyyy-MM-dd}/debug-%d{yyyy-MM-dd}-%i.log 30 500MB @@ -58,7 +58,7 @@ ${logDir}/info.log - ${logDir}/info-%d{yyyy-MM-dd}-%i.log + ${logDir}/%d{yyyy-MM-dd}/info-%d{yyyy-MM-dd}-%i.log 30 500MB @@ -80,7 +80,7 @@ ${logDir}/warn.log - ${logDir}/warn-%d{yyyy-MM-dd}-%i.log + ${logDir}/%d{yyyy-MM-dd}/warn-%d{yyyy-MM-dd}-%i.log 30 500MB @@ -102,7 +102,7 @@ ${logDir}/error.log - ${logDir}/error-%d{yyyy-MM-dd}-%i.log + ${logDir}/%d{yyyy-MM-dd}/error-%d{yyyy-MM-dd}-%i.log 30 500MB @@ -126,7 +126,7 @@ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger [%file : %line] - %msg%n - ${logDir}/${appName}-%d{yyyy-MM-dd}.log + ${logDir}/%d{yyyy-MM-dd}/${appName}-%d{yyyy-MM-dd}.log diff --git a/remi-comm/pom.xml b/remi-comm/pom.xml index 0102c96..a865f20 100644 --- a/remi-comm/pom.xml +++ b/remi-comm/pom.xml @@ -2,22 +2,26 @@ 4.0.0 + ai.remi.top.comm remi-comm remi-comm pom - 瑞米平台-公共依赖 + 瑞米平台-公共依赖模块 ai.remi.top.cloud remi-cloud - 3.1.1 + 3.1.0 + 17 ${java.version} ${java.version} + UTF-8 + UTF-8 @@ -40,17 +44,531 @@ remi-comm-web + + + + + spring-boot-dependencies + org.springframework.boot + import + pom + ${spring-boot.version} + + + + + spring-cloud-dependencies + org.springframework.cloud + import + pom + ${spring-cloud.version} + + + + + spring-cloud-alibaba-dependencies + com.alibaba.cloud + import + pom + ${spring-cloud-alibaba.version} + + + + + + ai.remi.top.comm + remi-comm + ${remi-comm.version} + + + ai.remi.top.comm + remi-comm-core + ${remi-comm.version} + + + ai.remi.top.comm + remi-comm-minio + ${remi-comm.version} + + + ai.remi.top.comm + remi-comm-redis + ${remi-comm.version} + + + ai.remi.top.comm + remi-comm-jdbc + ${remi-comm.version} + + + ai.remi.top.comm + remi-comm-domain + ${remi-comm.version} + + + ai.remi.top.comm + remi-comm-exception + ${remi-comm.version} + + + ai.remi.top.comm + remi-comm-feign + ${remi-comm.version} + + + ai.remi.top.comm + remi-comm-job + ${remi-comm.version} + + + ai.remi.top.comm + remi-comm-log + ${remi-comm.version} + + + ai.remi.top.comm + remi-comm-swagger + ${remi-comm.version} + + + ai.remi.top.comm + remi-comm-thread + ${remi-comm.version} + + + ai.remi.top.comm + remi-comm-util + ${remi-comm.version} + + + ai.remi.top.comm + remi-comm-auth + ${remi-comm.version} + + + ai.remi.top.comm + remi-comm-safe + ${remi-comm.version} + + + ai.remi.top.comm + remi-comm-web + ${remi-comm.version} + + + + + + + mybatis-plus-boot-starter + com.baomidou + ${mybatis-plus.version} + + + mybatis-plus-annotation + com.baomidou + ${mybatis-plus.version} + + + mybatis-plus-extension + com.baomidou + ${mybatis-plus.version} + + + + mybatis-spring-boot-starter + org.mybatis.spring.boot + ${mybatis.version} + + + + druid-spring-boot-starter + com.alibaba + ${druid.version} + + + + mysql + mysql-connector-java + ${mysql.version} + + + + com.oracle.database.jdbc + ojdbc8 + ${ojdbc.version} + + + com.oracle.database.nls + orai18n + ${ojdbc.version} + + + + com.microsoft.sqlserver + mssql-jdbc + ${mssql-jdbc.version} + + + + com.ibm.db2 + jcc + ${db2-jdbc.version} + + + + org.postgresql + postgresql + ${postgresql.version} + + + + com.h2database + h2 + ${h2.db.version} + + + + + + + org.apache.commons + commons-text + ${commons-text.version} + + + commons-io + commons-io + ${commons-io.version} + + + commons-lang3 + org.apache.commons + ${commons-lang3.version} + + + commons-codec + commons-codec + ${commons-codec.version} + + + commons-logging + commons-logging + ${commons-logging.version} + + + commons-net + commons-net + ${commons-net.version} + + + commons-collections + commons-collections + ${commons-collections.version} + + + + org.apache.tika + tika-core + ${tika.version} + + + + + com.qiniu + qiniu-java-sdk + ${qiniu.version} + + + + + com.aliyun.oss + aliyun-sdk-oss + ${aliyun-sdk-oss.version} + + + + + io.minio + minio + ${minio.version} + + + + + software.amazon.awssdk + s3 + ${awssdk.version} + + + + + com.qcloud + cos_api + ${cos_api.version} + + + + + commons-validator + commons-validator + ${commons-validator.version} + + + hibernate-validator + org.hibernate.validator + ${hibernate-validator.version} + + + hibernate-validator + org.hibernate + ${hibernate-validator.version} + + + + okhttp + com.squareup.okhttp3 + ${okhttp3.version} + + + logging-interceptor + com.squareup.okhttp3 + ${okhttp3.version} + + + + httpclient + org.apache.httpcomponents + ${httpclient.version} + + + + javax.servlet-api + javax.servlet + ${javax.version} + + + + device-detector + io.github.mngsk + ${device.version} + + + + guava + com.google.guava + ${guava.version} + + + + apm-toolkit-trace + org.apache.skywalking + ${trace.version} + + + + fastjson + com.alibaba + ${fastjson.version} + + + + jackson-core + com.fasterxml.jackson.core + ${jackson.version} + + + jackson-annotations + com.fasterxml.jackson.core + ${jackson.version} + + + jackson-databind + com.fasterxml.jackson.core + ${jackson.version} + + + + gson + com.google.code.gson + ${gson.version} + + + + eu.bitwalker + UserAgentUtils + ${bitwalker.version} + + + + org.lionsoul + ip2region + ${ip2region.version} + + + + cn.hutool + hutool-core + ${hutool.version} + + + cn.hutool + hutool-extra + ${hutool.version} + + + cn.hutool + hutool-http + ${hutool.version} + + + cn.hutool + hutool-json + ${hutool.version} + + + cn.hutool + hutool-crypto + ${hutool.version} + + + cn.hutool + hutool-all + ${hutool.version} + + + + dom4j + org.dom4j + ${dom4j.version} + + + + xxl-job-core + com.xuxueli + ${xxl-job.version} + + + + com.github.xiaoymin + knife4j-openapi3-spring-boot-starter + ${knife4j.version} + + + com.github.xiaoymin + knife4j-gateway-spring-boot-starter + ${knife4j.version} + + + + easyexcel + com.alibaba + ${easyexcel.version} + + + + org.apache.velocity + velocity + ${velocity.version} + + + + cglib + cglib + ${cglib.version} + + + + lombok + org.projectlombok + ${lombok.version} + + + org.projectlombok + lombok-mapstruct-binding + ${lombok-mapstruct.version} + + + + mapstruct + org.mapstruct + ${mapstruct.version} + + + mapstruct-processor + org.mapstruct + ${mapstruct.version} + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-ext + ${slf4j.version} + + + org.slf4j + slf4j-reload4j + ${slf4j.version} + compile + + + org.slf4j + slf4j-simple + ${slf4j.version} + + + org.slf4j + slf4j-nop + ${slf4j.version} + + + + + maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ + + + + public + remi nexus + https://remi.njydsz.com/repository/remi-top + + true + + + true + + + + + + + public + remi nexus + https://remi.njydsz.com/repository/remi-top + + true + + + true + + + \ No newline at end of file diff --git a/remi-comm/remi-comm-auth/pom.xml b/remi-comm/remi-comm-auth/pom.xml index 6e859ba..3bc786c 100644 --- a/remi-comm/remi-comm-auth/pom.xml +++ b/remi-comm/remi-comm-auth/pom.xml @@ -8,9 +8,9 @@ remi-comm-auth - ai.remi.top.cloud + ai.remi.top.comm remi-comm - 3.1.1 + 3.1.0 @@ -18,27 +18,27 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-core - ai.remi.top.cloud + ai.remi.top.comm remi-comm-redis - ai.remi.top.cloud + ai.remi.top.comm remi-comm-exception diff --git a/remi-comm/remi-comm-core/pom.xml b/remi-comm/remi-comm-core/pom.xml index aa4de50..1485cdb 100644 --- a/remi-comm/remi-comm-core/pom.xml +++ b/remi-comm/remi-comm-core/pom.xml @@ -7,9 +7,9 @@ remi-comm-core - ai.remi.top.cloud + ai.remi.top.comm remi-comm - 3.1.1 + 3.1.0 @@ -17,12 +17,12 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ diff --git a/remi-comm/remi-comm-core/src/main/java/ai/remi/comm/core/spring/SpringBeans.java b/remi-comm/remi-comm-core/src/main/java/ai/remi/comm/core/spring/SpringBeans.java index 2770c58..7435a79 100644 --- a/remi-comm/remi-comm-core/src/main/java/ai/remi/comm/core/spring/SpringBeans.java +++ b/remi-comm/remi-comm-core/src/main/java/ai/remi/comm/core/spring/SpringBeans.java @@ -26,28 +26,28 @@ public class SpringBeans implements ApplicationContextAware { } /** - * Created by dianjiu on 2022-06-23 ,contact lidianjiu@njydsz.com. 获取applicationContext. + * Created by dianjiu on 2022-06-23 ,contact dianjiuxyz@gmail.com. 获取applicationContext. */ public static ApplicationContext getApplicationContext() { return applicationContext; } /** - * Created by dianjiu on 2022-06-23 ,contact lidianjiu@njydsz.com. 通过name获取 Bean. + * Created by dianjiu on 2022-06-23 ,contact dianjiuxyz@gmail.com. 通过name获取 Bean. */ public static Object getBean(String name) { return getApplicationContext().getBean(name); } /** - * Created by dianjiu on 2022-06-23 ,contact lidianjiu@njydsz.com. 通过class获取Bean. + * Created by dianjiu on 2022-06-23 ,contact dianjiuxyz@gmail.com. 通过class获取Bean. */ public static T getBean(Class clazz) { return getApplicationContext().getBean(clazz); } /** - * Created by dianjiu on 2022-06-23 ,contact lidianjiu@njydsz.com. 通过name,以及Clazz返回指定的Bean. + * Created by dianjiu on 2022-06-23 ,contact dianjiuxyz@gmail.com. 通过name,以及Clazz返回指定的Bean. */ public static T getBean(String name, Class clazz) { return getApplicationContext().getBean(name, clazz); diff --git a/remi-comm/remi-comm-domain/pom.xml b/remi-comm/remi-comm-domain/pom.xml index b36bb16..f8810df 100644 --- a/remi-comm/remi-comm-domain/pom.xml +++ b/remi-comm/remi-comm-domain/pom.xml @@ -7,9 +7,9 @@ remi-comm-domain - ai.remi.top.cloud + ai.remi.top.comm remi-comm - 3.1.1 + 3.1.0 @@ -17,24 +17,24 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-core - ai.remi.top.cloud + ai.remi.top.comm remi-comm-util diff --git a/remi-comm/remi-comm-email/pom.xml b/remi-comm/remi-comm-email/pom.xml index b16d910..1cb2a28 100644 --- a/remi-comm/remi-comm-email/pom.xml +++ b/remi-comm/remi-comm-email/pom.xml @@ -7,9 +7,9 @@ remi-comm-email - ai.remi.top.cloud + ai.remi.top.comm remi-comm - 3.1.1 + 3.1.0 @@ -17,19 +17,19 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-core diff --git a/remi-comm/remi-comm-exception/pom.xml b/remi-comm/remi-comm-exception/pom.xml index fdc23b1..29ed1f1 100644 --- a/remi-comm/remi-comm-exception/pom.xml +++ b/remi-comm/remi-comm-exception/pom.xml @@ -7,9 +7,9 @@ remi-comm-exception - ai.remi.top.cloud + ai.remi.top.comm remi-comm - 3.1.1 + 3.1.0 @@ -17,19 +17,19 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-domain diff --git a/remi-comm/remi-comm-feign/pom.xml b/remi-comm/remi-comm-feign/pom.xml index d3a0e00..5836093 100644 --- a/remi-comm/remi-comm-feign/pom.xml +++ b/remi-comm/remi-comm-feign/pom.xml @@ -7,9 +7,9 @@ remi-comm-feign - ai.remi.top.cloud + ai.remi.top.comm remi-comm - 3.1.1 + 3.1.0 @@ -17,24 +17,19 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ - - - org.springframework.cloud - spring-cloud-starter-openfeign - - ai.remi.top.cloud + ai.remi.top.comm remi-comm-util @@ -42,6 +37,11 @@ javax.servlet javax.servlet-api + + + org.springframework.cloud + spring-cloud-starter-openfeign + org.slf4j diff --git a/remi-comm/remi-comm-jdbc/pom.xml b/remi-comm/remi-comm-jdbc/pom.xml index 62bb34e..dc542b5 100644 --- a/remi-comm/remi-comm-jdbc/pom.xml +++ b/remi-comm/remi-comm-jdbc/pom.xml @@ -7,9 +7,9 @@ remi-comm-jdbc - ai.remi.top.cloud + ai.remi.top.comm remi-comm - 3.1.1 + 3.1.0 @@ -17,24 +17,24 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-core - ai.remi.top.cloud + ai.remi.top.comm remi-comm-util @@ -71,6 +71,35 @@ mysql runtime + + + com.oracle.database.jdbc + ojdbc8 + + + com.oracle.database.nls + orai18n + + + + com.microsoft.sqlserver + mssql-jdbc + + + + com.ibm.db2 + jcc + + + + org.postgresql + postgresql + + + + com.h2database + h2 + org.slf4j diff --git a/remi-comm/remi-comm-job/pom.xml b/remi-comm/remi-comm-job/pom.xml index a663bc9..cb44651 100644 --- a/remi-comm/remi-comm-job/pom.xml +++ b/remi-comm/remi-comm-job/pom.xml @@ -7,9 +7,9 @@ remi-comm-job - ai.remi.top.cloud + ai.remi.top.comm remi-comm - 3.1.1 + 3.1.0 @@ -17,19 +17,19 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-core diff --git a/remi-comm/remi-comm-log/pom.xml b/remi-comm/remi-comm-log/pom.xml index e2bfae0..a9074db 100644 --- a/remi-comm/remi-comm-log/pom.xml +++ b/remi-comm/remi-comm-log/pom.xml @@ -8,9 +8,9 @@ remi-comm-log - ai.remi.top.cloud + ai.remi.top.comm remi-comm - 3.1.1 + 3.1.0 @@ -18,12 +18,12 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ @@ -44,22 +44,17 @@ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-core - ai.remi.top.cloud + ai.remi.top.comm remi-comm-util - ai.remi.top.cloud + ai.remi.top.comm remi-comm-redis - - - ai.remi.top.cloud - remi-sys-api - org.projectlombok diff --git a/remi-comm/remi-comm-log/src/main/java/ai/remi/comm/log/aspect/LogRecordAspect.java b/remi-comm/remi-comm-log/src/main/java/ai/remi/comm/log/aspect/LogRecordAspect.java index a2d6e53..01a10a9 100644 --- a/remi-comm/remi-comm-log/src/main/java/ai/remi/comm/log/aspect/LogRecordAspect.java +++ b/remi-comm/remi-comm-log/src/main/java/ai/remi/comm/log/aspect/LogRecordAspect.java @@ -4,6 +4,7 @@ import ai.remi.comm.core.spring.SpringProperties; import ai.remi.comm.log.annotation.LogRecord; import ai.remi.comm.log.domain.OperateLog; import ai.remi.comm.log.enums.BusinessStatus; +import ai.remi.comm.log.enums.OperatorUser; import ai.remi.comm.log.filter.PropertyPreExcludeFilter; import ai.remi.comm.log.service.AsyncLogService; import ai.remi.comm.redis.service.RedisService; @@ -14,7 +15,6 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; -import ai.remi.comm.log.enums.RedisKeyEnum; import eu.bitwalker.useragentutils.UserAgent; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; @@ -137,10 +137,10 @@ public class LogRecordAspect { //从请求头获取操作人 String accessToken = request.getHeader("X-Access-Token"); threadInfo.put("token", accessToken); - threadInfo.put("userId", redisService.hget(RedisKeyEnum.USER_INFO.getKey(accessToken), "id")); - threadInfo.put("userCode", redisService.hget(RedisKeyEnum.USER_INFO.getKey(accessToken), "userCode")); - threadInfo.put("userName", redisService.hget(RedisKeyEnum.USER_INFO.getKey(accessToken), "userName")); - threadInfo.put("userNameEn", redisService.hget(RedisKeyEnum.USER_INFO.getKey(accessToken), "userNameEn")); + threadInfo.put("userId", redisService.hget(OperatorUser.USER_INFO.getKey(accessToken), "id")); + threadInfo.put("userCode", redisService.hget(OperatorUser.USER_INFO.getKey(accessToken), "userCode")); + threadInfo.put("userName", redisService.hget(OperatorUser.USER_INFO.getKey(accessToken), "userName")); + threadInfo.put("userNameEn", redisService.hget(OperatorUser.USER_INFO.getKey(accessToken), "userNameEn")); //从请求头获取系统语言 threadInfo.put("language", request.getHeader("X-USER-LANGUAGE")); //从请求头获取业务流水号 @@ -201,7 +201,7 @@ public class LogRecordAspect { } // 保存数据库 - //asyncLogService.saveOperateLog(operateLog); + asyncLogService.saveOperateLog(operateLog); } catch (Exception exp) { // 记录本地异常日志 log.error("异常信息:{}", exp.getMessage()); @@ -272,13 +272,13 @@ public class LogRecordAspect { */ private void setOperateUser(String accessToken, OperateLog operateLog) { if (StringUtils.isNotBlank(accessToken)) { - String id = String.valueOf(redisService.hget(RedisKeyEnum.USER_INFO.getKey(accessToken), "id")); + String id = String.valueOf(redisService.hget(OperatorUser.USER_INFO.getKey(accessToken), "id")); operateLog.setUserId(id); - String userCode = String.valueOf(redisService.hget(RedisKeyEnum.USER_INFO.getKey(accessToken), "userCode")); + String userCode = String.valueOf(redisService.hget(OperatorUser.USER_INFO.getKey(accessToken), "userCode")); operateLog.setUserCode(userCode); - String userName = String.valueOf(redisService.hget(RedisKeyEnum.USER_INFO.getKey(accessToken), "userName")); + String userName = String.valueOf(redisService.hget(OperatorUser.USER_INFO.getKey(accessToken), "userName")); operateLog.setUserName(userName); - String userNameEn = String.valueOf(redisService.hget(RedisKeyEnum.USER_INFO.getKey(accessToken), "userNameEn")); + String userNameEn = String.valueOf(redisService.hget(OperatorUser.USER_INFO.getKey(accessToken), "userNameEn")); operateLog.setUserNameEn(userNameEn); } } diff --git a/remi-comm/remi-comm-log/src/main/java/ai/remi/comm/log/enums/RedisKeyEnum.java b/remi-comm/remi-comm-log/src/main/java/ai/remi/comm/log/enums/OperatorUser.java similarity index 67% rename from remi-comm/remi-comm-log/src/main/java/ai/remi/comm/log/enums/RedisKeyEnum.java rename to remi-comm/remi-comm-log/src/main/java/ai/remi/comm/log/enums/OperatorUser.java index 73492b0..4ba354a 100644 --- a/remi-comm/remi-comm-log/src/main/java/ai/remi/comm/log/enums/RedisKeyEnum.java +++ b/remi-comm/remi-comm-log/src/main/java/ai/remi/comm/log/enums/OperatorUser.java @@ -12,16 +12,12 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum RedisKeyEnum { +public enum OperatorUser { /** * 客户登录token,24小时失效 1:{} = customerId 2:{} = token 使用方式 RedisKeysEnum.CUSTOMER_LOGIN_TOKEN.getKey(customerId,token) */ - APP_CODE("sdt-saas-iam:app-code:{}:{}"), - USER_INFO("sdt-saas-iam:user-info:{}"), - TICKET("sdt-saas-iam:ticket:{}"), - AUTH_CODE("sdt-saas-iam:auth-code:{}"), - ACCESS_TOKEN("sdt-saas-iam:access-token:{}"), - REFRESH_TOKEN("sdt-saas-iam:refresh-token:{}"); + APP_CODE("remi-saas-iam:app-code:{}:{}"), + USER_INFO("remi-saas-iam:user-info:{}"); /** diff --git a/remi-comm/remi-comm-log/src/main/java/ai/remi/comm/log/service/AsyncLogService.java b/remi-comm/remi-comm-log/src/main/java/ai/remi/comm/log/service/AsyncLogService.java index 2c04f4b..fed2289 100644 --- a/remi-comm/remi-comm-log/src/main/java/ai/remi/comm/log/service/AsyncLogService.java +++ b/remi-comm/remi-comm-log/src/main/java/ai/remi/comm/log/service/AsyncLogService.java @@ -1,7 +1,14 @@ package ai.remi.comm.log.service; +import ai.remi.comm.log.domain.OperateLog; +import ai.remi.comm.util.auth.CompanyAuthInfo; +import ai.remi.comm.util.auth.RequestHolder; +import ai.remi.comm.util.bean.BeanCopyUtils; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + /** * 异步调用日志服务 */ @@ -12,18 +19,18 @@ public class AsyncLogService { * 通过OpenFeign客户端注入 */ //@Resource - //private SysClientApi sysClientApi; + //private IamClientApi iamClientApi; /** * 保存系统日志记录 */ - //@Async - //public void saveOperateLog(OperateLog operateLog) { - //CompanyAuthInfo companyAuthInfo = new CompanyAuthInfo(); - //companyAuthInfo.setDeptTenantId(operateLog.getDeptTenantId()); - //companyAuthInfo.setCompanyTenantId(operateLog.getCompanyTenantId()); - //RequestHolder.add(companyAuthInfo); + @Async + public void saveOperateLog(OperateLog operateLog) { + CompanyAuthInfo companyAuthInfo = new CompanyAuthInfo(); + companyAuthInfo.setDeptTenantId(operateLog.getDeptTenantId()); + companyAuthInfo.setCompanyTenantId(operateLog.getCompanyTenantId()); + RequestHolder.add(companyAuthInfo); //LogRecordPostDTO logRecordPostDTO = BeanCopyUtils.copyPropertiesThird(operateLog, LogRecordPostDTO.class); - //sysClientApi.addLogRecord(logRecordPostDTO); - //} + //iamClientApi.addLogRecord(logRecordPostDTO); + } } diff --git a/remi-comm/remi-comm-minio/pom.xml b/remi-comm/remi-comm-minio/pom.xml index f8baa08..a0851f7 100644 --- a/remi-comm/remi-comm-minio/pom.xml +++ b/remi-comm/remi-comm-minio/pom.xml @@ -7,9 +7,9 @@ remi-comm-minio - ai.remi.top.cloud + ai.remi.top.comm remi-comm - 3.1.1 + 3.1.0 @@ -17,12 +17,12 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ @@ -34,7 +34,7 @@ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-core diff --git a/remi-comm/remi-comm-redis/pom.xml b/remi-comm/remi-comm-redis/pom.xml index 1449c56..680aafe 100644 --- a/remi-comm/remi-comm-redis/pom.xml +++ b/remi-comm/remi-comm-redis/pom.xml @@ -7,9 +7,9 @@ remi-comm-redis - ai.remi.top.cloud + ai.remi.top.comm remi-comm - 3.1.1 + 3.1.0 @@ -17,19 +17,19 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-core diff --git a/remi-comm/remi-comm-safe/pom.xml b/remi-comm/remi-comm-safe/pom.xml index 243dfb3..43c207e 100644 --- a/remi-comm/remi-comm-safe/pom.xml +++ b/remi-comm/remi-comm-safe/pom.xml @@ -8,9 +8,9 @@ remi-comm-safe - ai.remi.top.cloud + ai.remi.top.comm remi-comm - 3.1.1 + 3.1.0 @@ -18,31 +18,31 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-core - ai.remi.top.cloud + ai.remi.top.comm remi-comm-redis - ai.remi.top.cloud + ai.remi.top.comm remi-comm-util - ai.remi.top.cloud + ai.remi.top.comm remi-comm-exception diff --git a/remi-comm/remi-comm-swagger/pom.xml b/remi-comm/remi-comm-swagger/pom.xml index 1f24fde..a39dcee 100644 --- a/remi-comm/remi-comm-swagger/pom.xml +++ b/remi-comm/remi-comm-swagger/pom.xml @@ -7,9 +7,9 @@ remi-comm-swagger - ai.remi.top.cloud + ai.remi.top.comm remi-comm - 3.1.1 + 3.1.0 @@ -17,19 +17,19 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-core diff --git a/remi-comm/remi-comm-thread/pom.xml b/remi-comm/remi-comm-thread/pom.xml index 33a686e..59672c8 100644 --- a/remi-comm/remi-comm-thread/pom.xml +++ b/remi-comm/remi-comm-thread/pom.xml @@ -7,9 +7,9 @@ remi-comm-thread - ai.remi.top.cloud + ai.remi.top.comm remi-comm - 3.1.1 + 3.1.0 @@ -17,12 +17,12 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ @@ -32,6 +32,10 @@ org.springframework.boot spring-boot-starter-web + diff --git a/remi-comm/remi-comm-thread/src/main/java/ai/remi/comm/thread/config/CustomThreadPollTaskExecutor.java b/remi-comm/remi-comm-thread/src/main/java/ai/remi/comm/thread/config/CustomThreadPollTaskExecutor.java index d26a823..f03d889 100644 --- a/remi-comm/remi-comm-thread/src/main/java/ai/remi/comm/thread/config/CustomThreadPollTaskExecutor.java +++ b/remi-comm/remi-comm-thread/src/main/java/ai/remi/comm/thread/config/CustomThreadPollTaskExecutor.java @@ -12,7 +12,7 @@ import java.util.concurrent.ThreadPoolExecutor; /** * @author DianJiu 【公众号 点九开源】 - * @email lidianjiu@njydsz.com + * @email dianjiuxyz@gmail.com * @date 2022-07-14 * @desc */ diff --git a/remi-comm/remi-comm-thread/src/main/java/ai/remi/comm/thread/config/ThreadPoolConfiguration.java b/remi-comm/remi-comm-thread/src/main/java/ai/remi/comm/thread/config/ThreadPoolConfiguration.java index fa515d5..6d0c2df 100644 --- a/remi-comm/remi-comm-thread/src/main/java/ai/remi/comm/thread/config/ThreadPoolConfiguration.java +++ b/remi-comm/remi-comm-thread/src/main/java/ai/remi/comm/thread/config/ThreadPoolConfiguration.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; /** * @author DianJiu 【公众号 点九开源】 - * @email lidianjiu@njydsz.com + * @email dianjiuxyz@gmail.com * @date 2022-07-20 * @desc */ diff --git a/remi-comm/remi-comm-thread/src/main/java/ai/remi/comm/thread/pool/OverrideDefaultThreadPool.java b/remi-comm/remi-comm-thread/src/main/java/ai/remi/comm/thread/pool/OverrideDefaultThreadPool.java index 7ec3f98..4c84bd9 100644 --- a/remi-comm/remi-comm-thread/src/main/java/ai/remi/comm/thread/pool/OverrideDefaultThreadPool.java +++ b/remi-comm/remi-comm-thread/src/main/java/ai/remi/comm/thread/pool/OverrideDefaultThreadPool.java @@ -18,7 +18,7 @@ import java.util.concurrent.ThreadPoolExecutor; /** * @author DianJiu 【公众号 点九开源】 * @author DianJiu 【公众号 点九开源】 - * @email lidianjiu@njydsz.com + * @email dianjiuxyz@gmail.com * @date 2022-07-20 * @desc 重写默认线程池配置 * 基于ThreadPoolTaskExecutor线程池配置 @@ -230,7 +230,6 @@ public class OverrideDefaultThreadPool implements AsyncConfigurer { return executor; } - /** * 使用方式：在某个service方法上使用该注解 * diff --git a/remi-comm/remi-comm-thread/src/main/resources/rebel.xml b/remi-comm/remi-comm-thread/src/main/resources/rebel.xml deleted file mode 100644 index 4a6451c..0000000 --- a/remi-comm/remi-comm-thread/src/main/resources/rebel.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - remi-comm-thread - - - - - - - diff --git a/remi-comm/remi-comm-util/pom.xml b/remi-comm/remi-comm-util/pom.xml index 2492454..6b99322 100644 --- a/remi-comm/remi-comm-util/pom.xml +++ b/remi-comm/remi-comm-util/pom.xml @@ -7,9 +7,9 @@ remi-comm-util - ai.remi.top.cloud + ai.remi.top.comm remi-comm - 3.1.1 + 3.1.0 @@ -17,19 +17,19 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-core @@ -110,8 +110,8 @@ - org.apache.commons commons-lang3 + org.apache.commons commons-io @@ -133,10 +133,6 @@ commons-collections commons-collections - - commons-fileupload - commons-fileupload - org.slf4j diff --git a/remi-comm/remi-comm-util/src/main/java/ai/remi/comm/util/array/SortUtils.java b/remi-comm/remi-comm-util/src/main/java/ai/remi/comm/util/array/SortUtils.java index c562858..a8cd64a 100644 --- a/remi-comm/remi-comm-util/src/main/java/ai/remi/comm/util/array/SortUtils.java +++ b/remi-comm/remi-comm-util/src/main/java/ai/remi/comm/util/array/SortUtils.java @@ -1,5 +1,7 @@ package ai.remi.comm.util.array; +import com.google.common.primitives.Ints; + import java.util.Arrays; public class SortUtils { @@ -109,7 +111,7 @@ public class SortUtils { int[] left = Arrays.stream(arr).boxed().filter(e -> e < pivot).mapToInt(e -> e).toArray(); int[] middle = Arrays.stream(arr).boxed().filter(e -> e == pivot).mapToInt(e -> e).toArray(); int[] right = Arrays.stream(arr).boxed().filter(e -> e > pivot).mapToInt(e -> e).toArray(); - return concat(quickSort2(left), middle, quickSort2(right)); + return Ints.concat(quickSort2(left), middle, quickSort2(right)); } /** @@ -143,15 +145,4 @@ public class SortUtils { arr[i] = arr[j]; arr[j] = temp; } - - public static int[] concat(int[] left, int[] middle, int[] right) { - int totalLength = left.length + middle.length + right.length; - int[] result = new int[totalLength]; - - System.arraycopy(left, 0, result, 0, left.length); - System.arraycopy(middle, 0, result, left.length, middle.length); - System.arraycopy(right, 0, result, left.length + middle.length, right.length); - - return result; - } } diff --git a/remi-comm/remi-comm-util/src/main/java/ai/remi/comm/util/bytes/ConvertBytesUtils.java b/remi-comm/remi-comm-util/src/main/java/ai/remi/comm/util/bytes/ConvertBytesUtils.java new file mode 100644 index 0000000..0daf562 --- /dev/null +++ b/remi-comm/remi-comm-util/src/main/java/ai/remi/comm/util/bytes/ConvertBytesUtils.java @@ -0,0 +1,51 @@ +package ai.remi.comm.util.bytes; + +/** + * 字节转换 + * + * @author dianjiu + * @date 2020-09-19 23:21 + */ +public class ConvertBytesUtils { + private static final long KB = 1024; + private static final long MB = KB * 1024; + private static final long GB = MB * 1024; + + /** + * 字节转换 + * + * @param size 字节大小 + * @return 转换后值 + */ + public static String convertFileSizeToString(long size) { + float fileSize = convertFileSize(size); + if (size >= GB) { + return String.format("%.1f GB" , fileSize); + } else if (size >= MB) { + return String.format(fileSize > 100 ? "%.0f MB" : "%.1f MB" , fileSize); + } else if (size >= KB) { + float f = (float) size / KB; + return String.format(fileSize > 100 ? "%.0f KB" : "%.1f KB" , fileSize); + } else { + return String.format("%d B" , size); + } + } + + /** + * 字节转换 + * + * @param size 字节大小 + * @return 转换后值 + */ + public static float convertFileSize(long size) { + if (size >= GB) { + return (float) size / GB; + } else if (size >= MB) { + return (float) size / MB; + } else if (size >= KB) { + return (float) size / KB; + } else { + return size; + } + } +} diff --git a/remi-comm/remi-comm-util/src/main/java/ai/remi/comm/util/cron/CronUtils.java b/remi-comm/remi-comm-util/src/main/java/ai/remi/comm/util/cron/CronUtils.java index 2fe2f4d..29b56a9 100644 --- a/remi-comm/remi-comm-util/src/main/java/ai/remi/comm/util/cron/CronUtils.java +++ b/remi-comm/remi-comm-util/src/main/java/ai/remi/comm/util/cron/CronUtils.java @@ -15,12 +15,4 @@ public class CronUtils { public static boolean isValid(String cronExpression) { return CronExpression.isValidExpression(cronExpression); } - - public static void main(String[] args) { - String validCron = "0 0 12 * * ?"; - String invalidCron = "invalid"; - - System.out.println("Valid Cron: " + isValid(validCron)); // 输出 true - System.out.println("Invalid Cron: " + isValid(invalidCron)); // 输出 false - } } diff --git a/remi-comm/remi-comm-util/src/main/java/ai/remi/comm/util/security/Rsa2Demo.java b/remi-comm/remi-comm-util/src/main/java/ai/remi/comm/util/security/Rsa2Demo.java index af312b2..4be17aa 100644 --- a/remi-comm/remi-comm-util/src/main/java/ai/remi/comm/util/security/Rsa2Demo.java +++ b/remi-comm/remi-comm-util/src/main/java/ai/remi/comm/util/security/Rsa2Demo.java @@ -2,7 +2,7 @@ package ai.remi.comm.util.security; /** * @author DianJiu 【公众号 点九开源】 - * @email lidianjiu@njydsz.com + * @email dianjiuxyz@gmail.com * @date 2022-07-26 * @desc 公钥加密，私钥解密；私钥加签，公钥验签。 */ diff --git a/remi-comm/remi-comm-web/pom.xml b/remi-comm/remi-comm-web/pom.xml index e56e81f..4118e8f 100644 --- a/remi-comm/remi-comm-web/pom.xml +++ b/remi-comm/remi-comm-web/pom.xml @@ -7,9 +7,9 @@ remi-comm-web - ai.remi.top.cloud + ai.remi.top.comm remi-comm - 3.1.1 + 3.1.0 @@ -17,39 +17,39 @@ maven-releases release - https://repository.njydsz.com/repository/maven-releases/ + https://remi.njydsz.com/repository/remi-top-releases/ maven-snapshots snapshot - https://repository.njydsz.com/repository/maven-snapshots/ + https://remi.njydsz.com/repository/remi-top-snapshots/ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-core - ai.remi.top.cloud + ai.remi.top.comm remi-comm-jdbc - ai.remi.top.cloud + ai.remi.top.comm remi-comm-util - ai.remi.top.cloud + ai.remi.top.comm remi-comm-exception - ai.remi.top.cloud + ai.remi.top.comm remi-comm-swagger diff --git a/remi-demo/pom.xml b/remi-demo/pom.xml index a090021..678cec7 100644 --- a/remi-demo/pom.xml +++ b/remi-demo/pom.xml @@ -2,90 +2,228 @@ 4.0.0 + ai.remi.top.demo remi-demo remi-demo pom + 瑞米平台-快速开发服务 ai.remi.top.cloud remi-cloud - 3.1.1 + 3.1.0 + 17 ${java.version} ${java.version} + UTF-8 + UTF-8 - - - - maven-releases - release - https://repository.njydsz.com/repository/maven-releases/ - - - maven-snapshots - snapshot - https://repository.njydsz.com/repository/maven-snapshots/ - - - remi-demo-domain remi-demo-infra remi-demo-server remi-demo-job remi-demo-app - remi-demo-web remi-demo-api + remi-demo-web + + + spring-boot-dependencies + org.springframework.boot + import + pom + ${spring-boot.version} + + + + + spring-cloud-dependencies + org.springframework.cloud + import + pom + ${spring-cloud.version} + + + + + spring-cloud-alibaba-dependencies + com.alibaba.cloud + import + pom + ${spring-cloud-alibaba.version} + + + + + + remi-comm + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-core + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-redis + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-jdbc + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-domain + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-exception + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-feign + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-job + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-log + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-swagger + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-thread + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-util + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-auth + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-safe + ai.remi.top.comm + ${remi-comm.version} + + + remi-comm-web + ai.remi.top.comm + ${remi-comm.version} + - ai.remi.top.cloud + ai.remi.top.demo remi-demo - ${remi.version} + ${remi-demo.version} - ai.remi.top.cloud + ai.remi.top.demo remi-demo-domain - ${remi.version} + ${remi-demo.version} - ai.remi.top.cloud + ai.remi.top.demo remi-demo-infra - ${remi.version} + ${remi-demo.version} - ai.remi.top.cloud + ai.remi.top.demo remi-demo-server - ${remi.version} + ${remi-demo.version} - ai.remi.top.cloud + ai.remi.top.demo remi-demo-job - ${remi.version} + ${remi-demo.version} - ai.remi.top.cloud + ai.remi.top.demo remi-demo-api - ${remi.version} + ${remi-demo.version} - ai.remi.top.cloud + ai.remi.top.demo remi-demo-app - ${remi.version} + ${remi-demo.version} - ai.remi.top.cloud + ai.remi.top.demo remi-demo-web - ${remi.version} + ${remi-demo.version} + + + + + + maven-releases + release + https://remi.njydsz.com/repository/remi-top-releases/ + + + maven-snapshots + snapshot + https://remi.njydsz.com/repository/remi-top-snapshots/ + + + + + + public + remi nexus + https://remi.njydsz.com/repository/remi-top + + true + + + true + + + + + + + public + remi nexus + https://remi.njydsz.com/repository/remi-top + + true + + + true + + + diff --git a/remi-demo/remi-demo-api/pom.xml b/remi-demo/remi-demo-api/pom.xml index ea234d5..a8fca2f 100644 --- a/remi-demo/remi-demo-api/pom.xml +++ b/remi-demo/remi-demo-api/pom.xml @@ -7,34 +7,20 @@ remi-demo-api - ai.remi.top.cloud + ai.remi.top.demo remi-demo - 3.1.1 + 3.1.0 - - - - maven-releases - release - https://repository.njydsz.com/repository/maven-releases/ - - - maven-snapshots - snapshot - https://repository.njydsz.com/repository/maven-snapshots/ - - - - ai.remi.top.cloud + ai.remi.top.comm remi-comm-feign - ai.remi.top.cloud + ai.remi.top.demo remi-demo-domain diff --git a/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/client/SysClientApi.java b/remi-demo/remi-demo-api/src/main/java/ai/remi/boot/api/client/IamClientApi.java similarity index 75% rename from remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/client/SysClientApi.java rename to remi-demo/remi-demo-api/src/main/java/ai/remi/boot/api/client/IamClientApi.java index 38432bd..2ec37e4 100644 --- a/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/client/SysClientApi.java +++ b/remi-demo/remi-demo-api/src/main/java/ai/remi/boot/api/client/IamClientApi.java @@ -1,10 +1,8 @@ -package ai.remi.sys.api.client; +package ai.remi.boot.api.client; import ai.remi.comm.core.result.ResultBean; import ai.remi.comm.feign.aspect.FeignAutoConfiguration; -import ai.remi.sys.api.factory.SysClientFactory; -import ai.remi.sys.domain.dto.post.LogRecordPostDTO; -import ai.remi.sys.domain.vo.ConfigVO; +import ai.remi.boot.api.factory.IamClientFactory; import io.swagger.v3.oas.annotations.Operation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; @@ -14,8 +12,8 @@ import org.springframework.web.bind.annotation.RequestParam; import java.util.List; -@FeignClient(value = "remi-sys-web", configuration = FeignAutoConfiguration.class, fallbackFactory = SysClientFactory.class) -public interface SysClientApi { +@FeignClient(value = "remi-boot-web", configuration = FeignAutoConfiguration.class, fallbackFactory = IamClientFactory.class) +public interface IamClientApi { @Operation(summary = "保存日志") @PostMapping("/logRecord/add") diff --git a/remi-demo/remi-demo-api/src/main/java/ai/remi/boot/api/factory/IamClientFactory.java b/remi-demo/remi-demo-api/src/main/java/ai/remi/boot/api/factory/IamClientFactory.java new file mode 100644 index 0000000..d9af04d --- /dev/null +++ b/remi-demo/remi-demo-api/src/main/java/ai/remi/boot/api/factory/IamClientFactory.java @@ -0,0 +1,18 @@ +package ai.remi.boot.api.factory; + +import ai.remi.boot.api.client.IamClientApi; +import ai.remi.boot.api.fallback.IamClientFallback; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +@Component +public class IamClientFactory implements FallbackFactory { + + @Override + public IamClientApi create(Throwable cause) { + IamClientFallback fallback = new IamClientFallback(); + fallback.setCause(cause); + return fallback; + } +} + diff --git a/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/fallback/SysClientFallback.java b/remi-demo/remi-demo-api/src/main/java/ai/remi/boot/api/fallback/IamClientFallback.java similarity index 75% rename from remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/fallback/SysClientFallback.java rename to remi-demo/remi-demo-api/src/main/java/ai/remi/boot/api/fallback/IamClientFallback.java index 7028a01..0288ec9 100644 --- a/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/fallback/SysClientFallback.java +++ b/remi-demo/remi-demo-api/src/main/java/ai/remi/boot/api/fallback/IamClientFallback.java @@ -1,16 +1,14 @@ -package ai.remi.sys.api.fallback; +package ai.remi.boot.api.fallback; import ai.remi.comm.core.result.ResultBean; -import ai.remi.sys.api.client.SysClientApi; -import ai.remi.sys.domain.dto.post.LogRecordPostDTO; -import ai.remi.sys.domain.vo.ConfigVO; +import ai.remi.boot.api.client.IamClientApi; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import java.util.List; @Slf4j -public class SysClientFallback implements SysClientApi { +public class IamClientFallback implements IamClientApi { @Setter private Throwable cause; diff --git a/remi-demo/remi-demo-api/src/main/java/ai/remi/demo/api/client/FeignClientApi.java b/remi-demo/remi-demo-api/src/main/java/ai/remi/demo/api/client/FeignClientApi.java deleted file mode 100644 index b87df71..0000000 --- a/remi-demo/remi-demo-api/src/main/java/ai/remi/demo/api/client/FeignClientApi.java +++ /dev/null @@ -1,14 +0,0 @@ -package ai.remi.demo.api.client; - -import ai.remi.demo.api.factory.FeignClientFactory; -import ai.remi.comm.feign.aspect.FeignAutoConfiguration; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -@FeignClient(value = "remi-demo-web", configuration = FeignAutoConfiguration.class, fallbackFactory = FeignClientFactory.class) -public interface FeignClientApi { - - @GetMapping("/books/findByBooksId") - String findById(@RequestParam("booksId") int booksId); -} diff --git a/remi-demo/remi-demo-api/src/main/java/ai/remi/demo/api/factory/FeignClientFactory.java b/remi-demo/remi-demo-api/src/main/java/ai/remi/demo/api/factory/FeignClientFactory.java deleted file mode 100644 index d4d1e53..0000000 --- a/remi-demo/remi-demo-api/src/main/java/ai/remi/demo/api/factory/FeignClientFactory.java +++ /dev/null @@ -1,18 +0,0 @@ -package ai.remi.demo.api.factory; - -import ai.remi.demo.api.client.FeignClientApi; -import ai.remi.demo.api.fallback.FeignClientFallback; -import org.springframework.cloud.openfeign.FallbackFactory; -import org.springframework.stereotype.Component; - -@Component -public class FeignClientFactory implements FallbackFactory { - - @Override - public FeignClientApi create(Throwable cause) { - FeignClientFallback fallback = new FeignClientFallback(); - fallback.setCause(cause); - return fallback; - } -} - diff --git a/remi-demo/remi-demo-api/src/main/java/ai/remi/demo/api/fallback/FeignClientFallback.java b/remi-demo/remi-demo-api/src/main/java/ai/remi/demo/api/fallback/FeignClientFallback.java deleted file mode 100644 index ddcddb1..0000000 --- a/remi-demo/remi-demo-api/src/main/java/ai/remi/demo/api/fallback/FeignClientFallback.java +++ /dev/null @@ -1,17 +0,0 @@ -package ai.remi.demo.api.fallback; - -import ai.remi.demo.api.client.FeignClientApi; -import lombok.Setter; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -public class FeignClientFallback implements FeignClientApi { - @Setter - private Throwable cause; - - @Override - public String findById(int goodsId) { - log.error("findById = {}", cause.getMessage()); - return null; - } -} diff --git a/remi-demo/remi-demo-app/pom.xml b/remi-demo/remi-demo-app/pom.xml index 41a007b..676577f 100644 --- a/remi-demo/remi-demo-app/pom.xml +++ b/remi-demo/remi-demo-app/pom.xml @@ -7,25 +7,11 @@ remi-demo-app - ai.remi.top.cloud + ai.remi.top.demo remi-demo - 3.1.1 + 3.1.0 - - - - maven-releases - release - https://repository.njydsz.com/repository/maven-releases/ - - - maven-snapshots - snapshot - https://repository.njydsz.com/repository/maven-snapshots/ - - - @@ -71,22 +57,29 @@ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-feign - - - ai.remi.top.cloud - remi-demo-job - - - ai.remi.top.cloud + ai.remi.top.demo + remi-demo-job + + + ai.remi.top.demo remi-demo-server + + + org.slf4j + slf4j-simple + + + org.slf4j + slf4j-nop + diff --git a/remi-sys/remi-sys-app/src/main/java/ai/remi/sys/app/Application.java b/remi-demo/remi-demo-app/src/main/java/ai/remi/boot/app/Application.java similarity index 85% rename from remi-sys/remi-sys-app/src/main/java/ai/remi/sys/app/Application.java rename to remi-demo/remi-demo-app/src/main/java/ai/remi/boot/app/Application.java index a1a7994..2ca2cf8 100644 --- a/remi-sys/remi-sys-app/src/main/java/ai/remi/sys/app/Application.java +++ b/remi-demo/remi-demo-app/src/main/java/ai/remi/boot/app/Application.java @@ -1,4 +1,4 @@ -package ai.remi.sys.app; +package ai.remi.boot.app; import ai.remi.comm.feign.annotation.EnableRemiFeignClients; import org.springframework.boot.SpringApplication; @@ -8,7 +8,7 @@ import org.springframework.context.annotation.EnableMBeanExport; import org.springframework.jmx.support.RegistrationPolicy; import org.springframework.transaction.annotation.EnableTransactionManagement; -//@Enableremitem +//@Enablestartdistem //@EnableLogRecord @EnableDiscoveryClient @EnableRemiFeignClients @@ -22,7 +22,7 @@ public class Application { SpringApplication.run(Application.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ Remi Cloud App 启动成功 ლ(´ڡ`ლ)ﾞ "); + System.out.println("(♥◠‿◠)ﾉﾞ Remi IAM App 启动成功 ლ(´ڡ`ლ)ﾞ "); } diff --git a/remi-demo/remi-demo-app/src/main/resources/bootstrap.yml b/remi-demo/remi-demo-app/src/main/resources/bootstrap.yml index e474534..09fd552 100644 --- a/remi-demo/remi-demo-app/src/main/resources/bootstrap.yml +++ b/remi-demo/remi-demo-app/src/main/resources/bootstrap.yml @@ -1,12 +1,12 @@ # 服务端口号 server: - port: 8081 + port: 12801 spring: application: - name: remi-bpm-web + name: remi-boot-app profiles: - active: dev + active: local cloud: # nacos nacos: @@ -15,9 +15,9 @@ spring: password: nacos discovery: # 配置中心的地址 - server-addr: ${NACOS_HOST:192.168.31.18}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:192.168.1.31}:${NACOS_PORT:8848} #命名空间 - namespace: ${SERVICE_NAME_SPACE_NAME:dev} + namespace: ${spring.profiles.active:dev} # 配置文件的环境 group: ${SERVICE_DISCOVERY_GROUP_NAME:dev} # 配置中心 @@ -39,7 +39,7 @@ spring: # 共享配置 shared-configs: # Data Id 的默认完整格式为： ${prefix}-${spring.profile.active}.${file-extension}。 - - dataId: remi-cloud-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - dataId: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} group: ${spring.cloud.nacos.discovery.group} #是否自动刷新 - refresh: true \ No newline at end of file + refresh: true diff --git a/remi-demo/remi-demo-app/src/main/resources/docker/Dockerfile b/remi-demo/remi-demo-app/src/main/resources/docker/Dockerfile index b506c1b..9bb751e 100644 --- a/remi-demo/remi-demo-app/src/main/resources/docker/Dockerfile +++ b/remi-demo/remi-demo-app/src/main/resources/docker/Dockerfile @@ -10,15 +10,15 @@ VOLUME /temp #ADD 将app.jar文件将拷贝到容器中，默认拷贝到根路径下 #也可以直接写成ADD app.jar /app.jar 或者 ADD app.jar / -ADD remi-demo-app-3.1.1.jar remi-demo-app.jar +ADD startdistem-web-1.0.0.jar startdistem-web.jar #修改app.jar这个文件的访问时间和修改时间为当前时间，而不会修改文件的内容。 -RUN bash -c "touch /remi-demo-app.jar" +RUN bash -c "touch /startdistem-web.jar" #ENTRYPOINT 应用启动命令 参数设定 #由于tomcat的session id的生成主要通过java.security.SecureRandom生成随机数来实现，导致启动过程很慢 #通过-Djava.security.egd=file:/dev/./urandom参数可以加快随机数产生过程 -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/remi-demo-app.jar"] +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/startdistem-web.jar"] #EXPOSE 容器暴露端口 -EXPOSE 8081 +EXPOSE 18080 diff --git a/remi-demo/remi-demo-app/src/main/resources/docker/README.md b/remi-demo/remi-demo-app/src/main/resources/docker/README.md index bdd058e..5b2e1c7 100644 --- a/remi-demo/remi-demo-app/src/main/resources/docker/README.md +++ b/remi-demo/remi-demo-app/src/main/resources/docker/README.md @@ -1,5 +1,5 @@ ```shell sh ./docker_deploy.sh -docker logs -f remi-demo-app +docker logs -f startdistem-web ``` \ No newline at end of file diff --git a/remi-demo/remi-demo-app/src/main/resources/docker/docker_deploy.sh b/remi-demo/remi-demo-app/src/main/resources/docker/docker_deploy.sh index 099ddcf..999d624 100644 --- a/remi-demo/remi-demo-app/src/main/resources/docker/docker_deploy.sh +++ b/remi-demo/remi-demo-app/src/main/resources/docker/docker_deploy.sh @@ -1,7 +1,7 @@ -docker stop remi-demo-app -docker rm -f remi-demo-app -docker rmi remi-demo-app -docker build -t remi-demo-app . +docker stop startdistem-web +docker rm -f startdistem-web +docker rmi startdistem-web +docker build -t startdistem-web . docker images -docker run --restart=always -t -dit -p 8081:8081 -e TZ="Asia/Shanghai" --name remi-demo-app remi-demo-app +docker run --restart=always -t -dit -p 18080:18080 -e TZ="Asia/Shanghai" --name startdistem-web startdistem-web docker ps diff --git a/remi-demo/remi-demo-app/src/main/resources/logback-spring.xml b/remi-demo/remi-demo-app/src/main/resources/logback-spring.xml index dac08c4..cd38010 100644 --- a/remi-demo/remi-demo-app/src/main/resources/logback-spring.xml +++ b/remi-demo/remi-demo-app/src/main/resources/logback-spring.xml @@ -1,152 +1,39 @@ - - - - - logback - - + + - - - - - - - - - - - debug - + + + + + + + - ${CONSOLE_LOG_PATTERN} - UTF-8 + ${LOG_PATTERN_CONSOLE} - - - - ${logDir}/debug.log + + + + ${LOG_PATTERN_FILE} + + + ${logDir}/${appName}.${fileType} - - ${logDir}/%d{yyyy-MM-dd}/debug-%d{yyyy-MM-dd}-%i.log + + ${logDir}/${appName}-%d{yyyy-MM-dd}.${fileType} + 30 - - 500MB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger [%file : %line] - %msg%n - UTF-8 - - - DEBUG - ACCEPT - DENY - - - - - - ${logDir}/info.log - - - ${logDir}/%d{yyyy-MM-dd}/info-%d{yyyy-MM-dd}-%i.log - 30 - - 500MB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger [%file : %line] - %msg%n - UTF-8 - - - INFO - ACCEPT - DENY - - - - - - ${logDir}/warn.log - - - ${logDir}/%d{yyyy-MM-dd}/warn-%d{yyyy-MM-dd}-%i.log - 30 - - 500MB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger [%file : %line] - %msg%n - UTF-8 - - - WARN - ACCEPT - DENY - - - - - - ${logDir}/error.log - - - ${logDir}/%d{yyyy-MM-dd}/error-%d{yyyy-MM-dd}-%i.log - 30 - - 500MB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger [%file : %line] - %msg%n - UTF-8 - - - ERROR - ACCEPT - DENY - - - - - - ${logDir}/${appName}.log - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger [%file : %line] - %msg%n - - - ${logDir}/%d{yyyy-MM-dd}/${appName}-%d{yyyy-MM-dd}.log - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/remi-demo/remi-demo-domain/pom.xml b/remi-demo/remi-demo-domain/pom.xml index e899545..40d5bb1 100644 --- a/remi-demo/remi-demo-domain/pom.xml +++ b/remi-demo/remi-demo-domain/pom.xml @@ -7,34 +7,20 @@ remi-demo-domain - ai.remi.top.cloud + ai.remi.top.demo remi-demo - 3.1.1 + 3.1.0 - - - - maven-releases - release - https://repository.njydsz.com/repository/maven-releases/ - - - maven-snapshots - snapshot - https://repository.njydsz.com/repository/maven-snapshots/ - - - - ai.remi.top.cloud + ai.remi.top.comm remi-comm-domain - ai.remi.top.cloud + ai.remi.top.comm remi-comm-swagger diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/SsoConstant.java b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/constant/SsoConstant.java similarity index 94% rename from remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/SsoConstant.java rename to remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/constant/SsoConstant.java index 23e1d63..838c408 100644 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/SsoConstant.java +++ b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/constant/SsoConstant.java @@ -1,4 +1,4 @@ -package ai.remi.sys.domain.constant; +package ai.remi.boot.domain.constant; /** * 单点登录基础常量 diff --git a/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/converter/UserConverter.java b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/converter/UserConverter.java new file mode 100644 index 0000000..8ae102e --- /dev/null +++ b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/converter/UserConverter.java @@ -0,0 +1,56 @@ +package ai.remi.boot.domain.converter; + + +import ai.remi.boot.domain.dto.post.UserPostDTO; +import ai.remi.boot.domain.dto.put.UserPutDTO; +import ai.remi.boot.domain.entity.User; +import ai.remi.boot.domain.query.UserQuery; +import ai.remi.boot.domain.vo.UserVO; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.factory.Mappers; + +/** + * @author DianJiu + * @email dianjiuxyz@gmail.com + * @desc 用户表 UserConverter转换接口 + */ +@Mapper +public interface UserConverter { + + UserConverter INSTANT = Mappers.getMapper(UserConverter.class); + + @Mapping(target = "id", ignore = true) + @Mapping(target = "deleted", ignore = true) + @Mapping(target = "revision", ignore = true) + @Mapping(target = "deptTenantId", ignore = true) + @Mapping(target = "companyTenantId", ignore = true) + @Mapping(target = "createdBy", ignore = true) + @Mapping(target = "createdAt", ignore = true) + @Mapping(target = "updatedBy", ignore = true) + @Mapping(target = "updatedAt", ignore = true) + User postDtoToEntity(UserPostDTO userDTO); + + @Mapping(target = "deleted", ignore = true) + @Mapping(target = "revision", ignore = true) + @Mapping(target = "deptTenantId", ignore = true) + @Mapping(target = "companyTenantId", ignore = true) + @Mapping(target = "createdBy", ignore = true) + @Mapping(target = "createdAt", ignore = true) + @Mapping(target = "updatedBy", ignore = true) + @Mapping(target = "updatedAt", ignore = true) + User putDtoToEntity(UserPutDTO userDTO); + + @Mapping(target = "deleted", ignore = true) + @Mapping(target = "revision", ignore = true) + @Mapping(target = "deptTenantId", ignore = true) + @Mapping(target = "companyTenantId", ignore = true) + @Mapping(target = "createdBy", ignore = true) + @Mapping(target = "createdAt", ignore = true) + @Mapping(target = "updatedBy", ignore = true) + @Mapping(target = "updatedAt", ignore = true) + User queryToEntity(UserQuery userQuery); + + UserVO entityToVO(User user); + +} diff --git a/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/dto/post/UserPostDTO.java b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/dto/post/UserPostDTO.java new file mode 100644 index 0000000..48435f6 --- /dev/null +++ b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/dto/post/UserPostDTO.java @@ -0,0 +1,195 @@ +package ai.remi.boot.domain.dto.post; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * @author DianJiu + * @email dianjiuxyz@gmail.com + * @desc 用户表 UserDTO对象 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@ToString(callSuper = true) +@Schema(description = "用户表") +public class UserPostDTO implements Serializable { + + private static final long serialVersionUID = -48342054464737753L; + + /** + * 所属公司ID + */ + @Schema(description = "所属公司ID") + private String companyId; + + /** + * 所属公司编码 + */ + @Schema(description = "所属公司编码") + private String companyCode; + + /** + * 所属部门ID + */ + @Schema(description = "所属部门ID") + private String deptId; + + /** + * 所属部门编码 + */ + @Schema(description = "所属部门编码") + private String deptCode; + + /** + * 用户编码/员工工号 + */ + @Schema(description = "用户编码/员工工号") + private String userCode; + + /** + * 用户名称 + */ + @Schema(description = "用户名称") + private String userName; + + /** + * 用户英文名称 + */ + @Schema(description = "用户英文名称") + private String userNameEn; + + /** + * 用户首名（东方为姓，西方为名） + */ + @Schema(description = "用户首名（东方为姓，西方为名）") + private String firstName; + + /** + * 用户中名（欧美人常用） + */ + @Schema(description = "用户中名（欧美人常用）") + private String middleName; + + /** + * 用户末名（东方为名，西方为姓） + */ + @Schema(description = "用户末名（东方为名，西方为姓）") + private String lastName; + + /** + * 用户昵称/别号 + */ + @Schema(description = "用户昵称/别号") + private String nickName; + + /** + * 登录账号 + */ + @Schema(description = "登录账号") + private String loginName; + + /** + * 登录密码 + */ + @Schema(description = "登录密码") + private String password; + + /** + * 职位ID + */ + @Schema(description = "职位ID") + private String positionId; + + /** + * 职位编码 + */ + @Schema(description = "职位编码") + private String positionCode; + + /** + * 职级ID + */ + @Schema(description = "职级ID") + private String rankId; + + /** + * 职级编码 + */ + @Schema(description = "职级编码") + private String rankCode; + + /** + * 用户描述 + */ + @Schema(description = "用户描述") + private String userRemark; + + /** + * 出生日期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Schema(description = "出生日期") + private LocalDate birthday; + + /** + * 证件号码 + */ + @Schema(description = "证件号码") + private String identity; + + /** + * 电话号码 + */ + @Schema(description = "电话号码") + private String phone; + + /** + * 电子邮箱 + */ + @Schema(description = "电子邮箱") + private String email; + + /** + * 用户性别（0女性 1男性） + */ + @Schema(description = "用户性别（0女性 1男性）") + private Integer sex; + + /** + * 头像地址 + */ + @Schema(description = "头像地址") + private String headPic; + + /** + * 最后登录IP + */ + @Schema(description = "最后登录IP") + private String loginIp; + + /** + * 最后登录时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Schema(description = "最后登录时间") + private LocalDateTime loginDate; + + /** + * 是否启用（0停用 1启用） + */ + @Schema(description = "是否启用（0停用 1启用）") + private Integer status; + + +} diff --git a/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/dto/put/UserPutDTO.java b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/dto/put/UserPutDTO.java new file mode 100644 index 0000000..68f44c8 --- /dev/null +++ b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/dto/put/UserPutDTO.java @@ -0,0 +1,201 @@ +package ai.remi.boot.domain.dto.put; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * @author DianJiu + * @email dianjiuxyz@gmail.com + * @desc 用户表 UserDTO对象 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@ToString(callSuper = true) +@Schema(description = "用户表") +public class UserPutDTO implements Serializable { + + private static final long serialVersionUID = -67424143626189045L; + + /** + * ID + */ + @Schema(description = "ID") + private String id; + + /** + * 所属公司ID + */ + @Schema(description = "所属公司ID") + private String companyId; + + /** + * 所属公司编码 + */ + @Schema(description = "所属公司编码") + private String companyCode; + + /** + * 所属部门ID + */ + @Schema(description = "所属部门ID") + private String deptId; + + /** + * 所属部门编码 + */ + @Schema(description = "所属部门编码") + private String deptCode; + + /** + * 用户编码/员工工号 + */ + @Schema(description = "用户编码/员工工号") + private String userCode; + + /** + * 用户名称 + */ + @Schema(description = "用户名称") + private String userName; + + /** + * 用户英文名称 + */ + @Schema(description = "用户英文名称") + private String userNameEn; + + /** + * 用户首名（东方为姓，西方为名） + */ + @Schema(description = "用户首名（东方为姓，西方为名）") + private String firstName; + + /** + * 用户中名（欧美人常用） + */ + @Schema(description = "用户中名（欧美人常用）") + private String middleName; + + /** + * 用户末名（东方为名，西方为姓） + */ + @Schema(description = "用户末名（东方为名，西方为姓）") + private String lastName; + + /** + * 用户昵称/别号 + */ + @Schema(description = "用户昵称/别号") + private String nickName; + + /** + * 登录账号 + */ + @Schema(description = "登录账号") + private String loginName; + + /** + * 登录密码 + */ + @Schema(description = "登录密码") + private String password; + + /** + * 职位ID + */ + @Schema(description = "职位ID") + private String positionId; + + /** + * 职位编码 + */ + @Schema(description = "职位编码") + private String positionCode; + + /** + * 职级ID + */ + @Schema(description = "职级ID") + private String rankId; + + /** + * 职级编码 + */ + @Schema(description = "职级编码") + private String rankCode; + + /** + * 用户描述 + */ + @Schema(description = "用户描述") + private String userRemark; + + /** + * 出生日期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Schema(description = "出生日期") + private LocalDate birthday; + + /** + * 证件号码 + */ + @Schema(description = "证件号码") + private String identity; + + /** + * 电话号码 + */ + @Schema(description = "电话号码") + private String phone; + + /** + * 电子邮箱 + */ + @Schema(description = "电子邮箱") + private String email; + + /** + * 用户性别（0女性 1男性） + */ + @Schema(description = "用户性别（0女性 1男性）") + private Integer sex; + + /** + * 头像地址 + */ + @Schema(description = "头像地址") + private String headPic; + + /** + * 最后登录IP + */ + @Schema(description = "最后登录IP") + private String loginIp; + + /** + * 最后登录时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Schema(description = "最后登录时间") + private LocalDateTime loginDate; + + /** + * 是否启用（0停用 1启用） + */ + @Schema(description = "是否启用（0停用 1启用）") + private Integer status; + + +} diff --git a/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/entity/User.java b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/entity/User.java new file mode 100644 index 0000000..834422f --- /dev/null +++ b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/entity/User.java @@ -0,0 +1,123 @@ +package ai.remi.boot.domain.entity; + + +import com.baomidou.mybatisplus.annotation.TableName; +import ai.remi.comm.domain.entity.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * @author DianJiu + * @email dianjiuxyz@gmail.com + * @desc 用户表 UserDTO对象 + */ +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@TableName("remi_user") +public class User extends BaseEntity { + + + /** + * 用户编码/员工工号 + */ + private String userCode; + + /** + * 登录账号 + */ + private String loginName; + + /** + * 用户名称 + */ + private String userName; + + /** + * 用户英文名称 + */ + private String userNameEn; + + /** + * 用户首名（东方为姓，西方为名） + */ + private String firstName; + + /** + * 用户中名（欧美人常用） + */ + private String middleName; + + /** + * 用户末名（东方为名，西方为姓） + */ + private String lastName; + + /** + * 用户昵称/别号 + */ + private String nickName; + + /** + * 用户描述 + */ + private String userRemark; + + /** + * 登录密码 + */ + private String password; + + /** + * 出生日期 + */ + private LocalDate birthday; + + /** + * 证件号码 + */ + private String identity; + + /** + * 电话号码 + */ + private String phone; + + /** + * 电子邮箱 + */ + private String email; + + /** + * 用户性别（0女性 1男性） + */ + private Integer sex; + + /** + * 头像地址 + */ + private String headPic; + + /** + * 最后登录IP + */ + private String loginIp; + + /** + * 最后登录时间 + */ + private LocalDateTime loginDate; + + /** + * 是否启用（0停用 1启用） + */ + private Integer status; + + +} diff --git a/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/enums/SsoCacheEnum.java b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/enums/SsoCacheEnum.java new file mode 100644 index 0000000..96a7235 --- /dev/null +++ b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/enums/SsoCacheEnum.java @@ -0,0 +1,39 @@ +package ai.remi.boot.domain.enums; + +import cn.hutool.core.util.StrUtil; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * Redis key枚举类 + * + * @author dianjiu + * @date 2021-12-7 16:10:35 + */ +@Getter +@AllArgsConstructor +public enum SsoCacheEnum { + /** + * 客户登录token,24小时失效 1:{} = customerId 2:{} = token 使用方式 RedisKeysEnum.CUSTOMER_LOGIN_TOKEN.getKey(customerId,token) + */ + APP_CODE("remi-saas-iam:app-code:{}:{}"), + USER_INFO("remi-saas-iam:user-info:{}"), + TICKET("remi-saas-iam:ticket:{}"), + AUTH_CODE("remi-saas-iam:auth-code:{}"), + ACCESS_TOKEN("remi-saas-iam:access-token:{}"), + REFRESH_TOKEN("remi-saas-iam:refresh-token:{}"); + + + /** + * redis key + */ + private String key; + + /** + * key失效时间，单位秒 + */ + //private Long expireAt; + public String getKey(String... key) { + return StrUtil.format(this.key, key); + } +} diff --git a/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/query/UserQuery.java b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/query/UserQuery.java new file mode 100644 index 0000000..c4b8279 --- /dev/null +++ b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/query/UserQuery.java @@ -0,0 +1,177 @@ +package ai.remi.boot.domain.query; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * @author DianJiu + * @email dianjiuxyz@gmail.com + * @desc 用户表 UserQuery对象 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@ToString(callSuper = true) +@Schema(description = "用户表") +public class UserQuery implements Serializable { + + private static final long serialVersionUID = 441095565282363416L; + + /** + * ID + */ + @Schema(description = "ID") + private String id; + + /** + * 用户编码/员工工号 + */ + @Schema(description = "用户编码/员工工号") + private String userCode; + + /** + * 所属公司ID + */ + @Schema(description = "所属公司ID") + private String companyId; + + /** + * 所属公司编码 + */ + @Schema(description = "所属公司编码") + private String companyCode; + + /** + * 所属部门ID + */ + @Schema(description = "所属部门ID") + private String deptId; + + /** + * 所属部门编码 + */ + @Schema(description = "所属部门编码") + private String deptCode; + + /** + * 登录账号 + */ + @Schema(description = "登录账号") + private String loginName; + + /** + * 用户名称 + */ + @Schema(description = "用户名称") + private String userName; + + /** + * 用户英文名称 + */ + @Schema(description = "用户英文名称") + private String userNameEn; + + /** + * 用户首名（东方为姓，西方为名） + */ + @Schema(description = "用户首名（东方为姓，西方为名）") + private String firstName; + + /** + * 用户中名（欧美人常用） + */ + @Schema(description = "用户中名（欧美人常用）") + private String middleName; + + /** + * 用户末名（东方为名，西方为姓） + */ + @Schema(description = "用户末名（东方为名，西方为姓）") + private String lastName; + + /** + * 用户昵称/别号 + */ + @Schema(description = "用户昵称/别号") + private String nickName; + + /** + * 用户描述 + */ + @Schema(description = "用户描述") + private String userRemark; + + /** + * 登录密码 + */ + @Schema(description = "登录密码") + private String password; + + /** + * 出生日期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Schema(description = "出生日期") + private LocalDate birthday; + + /** + * 证件号码 + */ + @Schema(description = "证件号码") + private String identity; + + /** + * 电话号码 + */ + @Schema(description = "电话号码") + private String phone; + + /** + * 电子邮箱 + */ + @Schema(description = "电子邮箱") + private String email; + + /** + * 用户性别（0女性 1男性） + */ + @Schema(description = "用户性别（0女性 1男性）") + private Integer sex; + + /** + * 头像地址 + */ + @Schema(description = "头像地址") + private String headPic; + + /** + * 最后登录IP + */ + @Schema(description = "最后登录IP") + private String loginIp; + + /** + * 最后登录时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Schema(description = "最后登录时间") + private LocalDateTime loginDate; + + /** + * 是否启用（0停用 1启用） + */ + @Schema(description = "是否启用（0停用 1启用）") + private Integer status; + +} + diff --git a/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/tree/GroupTree.java b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/tree/GroupTree.java new file mode 100644 index 0000000..3fa4aaa --- /dev/null +++ b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/tree/GroupTree.java @@ -0,0 +1,131 @@ +package ai.remi.boot.domain.tree; + +import com.fasterxml.jackson.annotation.JsonFormat; +import ai.remi.comm.domain.tree.TreeNode; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * @author Remi + * @email startdis@dianjiukeji.cn + * @desc 部门表 DeptVO对象 + */ +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@ToString(callSuper = true) +@Schema(description = "业务组织") +public class GroupTree extends TreeNode implements Serializable { + + private static final long serialVersionUID = 505874294590378764L; + + /** + * ID + */ + @Schema(description = "ID") + private String id; + /** + * 父菜单ID + */ + @Schema(description = "父菜单ID") + private String parentId; + /** + * 应用ID + */ + @Schema(description = "应用ID") + private String appId; + /** + * 应用编码 + */ + @Schema(description = "应用编码") + private String appCode; + /** + * 用户组编码 + */ + @Schema(description = "用户组编码") + private String groupCode; + /** + * 用户组名称 + */ + @Schema(description = "用户组名称") + private String groupName; + /** + * 用户组英文名称 + */ + @Schema(description = "用户组英文名称") + private String groupNameEn; + /** + * 用户组描述 + */ + @Schema(description = "用户组描述") + private String groupRemark; + /** + * 用户组英文描述 + */ + @Schema(description = "用户组英文描述") + private String groupRemarkEn; + /** + * 显示顺序 + */ + @Schema(description = "显示顺序") + private Integer sort; + /** + * 是否启用（0停用 1启用） + */ + @Schema(description = "是否启用（0停用 1启用）") + private Integer status; + /** + * 是否删除（0正常 1删除） + */ + @Schema(description = "是否删除（0正常 1删除）") + private Integer deleted; + /** + * 乐观锁 + */ + @Schema(description = "乐观锁") + private Integer revision; + /** + * 部门租户ID + */ + @Schema(description = "部门租户ID") + private String deptTenantId; + /** + * 公司租户ID + */ + @Schema(description = "公司租户ID") + private String companyTenantId; + /** + * 创建人 + */ + @Schema(description = "创建人") + private String createdBy; + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Schema(description = "创建时间") + private LocalDateTime createdAt; + /** + * 更新人 + */ + @Schema(description = "更新人") + private String updatedBy; + /** + * 更新时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Schema(description = "更新时间") + private LocalDateTime updatedAt; + +} diff --git a/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/vo/UserVO.java b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/vo/UserVO.java new file mode 100644 index 0000000..6ae827f --- /dev/null +++ b/remi-demo/remi-demo-domain/src/main/java/ai/remi/boot/domain/vo/UserVO.java @@ -0,0 +1,294 @@ +package ai.remi.boot.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +/** + * @author DianJiu + * @email dianjiuxyz@gmail.com + * @desc 用户表 UserVO对象 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@ToString(callSuper = true) +@Schema(description = "用户表") +public class UserVO implements Serializable { + + private static final long serialVersionUID = -23942899880966373L; + + /** + * ID + */ + @Schema(description = "ID") + private String id; + + /** + * 用户编码/员工工号 + */ + @Schema(description = "用户编码/员工工号") + private String userCode; + + /** + * 所属公司ID + */ + @Schema(description = "所属公司ID") + private String companyId; + + /** + * 所属公司编码 + */ + @Schema(description = "所属公司编码") + private String companyCode; + + /** + * 所属部门ID + */ + @Schema(description = "所属部门ID") + private String deptId; + + /** + * 所属部门编码 + */ + @Schema(description = "所属部门编码") + private String deptCode; + + /** + * 用户名称 + */ + @Schema(description = "用户名称") + private String userName; + + /** + * 用户英文名称 + */ + @Schema(description = "用户英文名称") + private String userNameEn; + + /** + * 用户首名（东方为姓，西方为名） + */ + @Schema(description = "用户首名（东方为姓，西方为名）") + private String firstName; + + /** + * 用户中名（欧美人常用） + */ + @Schema(description = "用户中名（欧美人常用）") + private String middleName; + + /** + * 用户末名（东方为名，西方为姓） + */ + @Schema(description = "用户末名（东方为名，西方为姓）") + private String lastName; + + /** + * 用户昵称/别号 + */ + @Schema(description = "用户昵称/别号") + private String nickName; + + /** + * 登录账号 + */ + @Schema(description = "登录账号") + private String loginName; + + /** + * 登录密码 + */ + @Schema(description = "登录密码") + private String password; + + /** + * 职位ID + */ + @Schema(description = "职位ID") + private String positionId; + + /** + * 职位编码 + */ + @Schema(description = "职位编码") + private String positionCode; + + /** + * 职位名称 + */ + @Schema(description = "职位名称") + private String positionName; + + /** + * 岗位英文名称 + */ + @Schema(description = "职位英文名称") + private String positionNameEn; + + /** + * 职级ID + */ + @Schema(description = "职级ID") + private String rankId; + + /** + * 职级编码 + */ + @Schema(description = "职级编码") + private String rankCode; + + /** + * 职级名称 + */ + @Schema(description = "职级名称") + private String rankName; + + /** + * 职级英文名称 + */ + @Schema(description = "职级英文名称") + private String rankNameEn; + + /** + * 用户描述 + */ + @Schema(description = "用户描述") + private String userRemark; + + /** + * 出生日期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @Schema(description = "出生日期") + private LocalDate birthday; + + /** + * 证件号码 + */ + @Schema(description = "证件号码") + private String identity; + + /** + * 电话号码 + */ + @Schema(description = "电话号码") + private String phone; + + /** + * 电子邮箱 + */ + @Schema(description = "电子邮箱") + private String email; + + /** + * 用户性别（0女性 1男性） + */ + @Schema(description = "用户性别（0女性 1男性）") + private Integer sex; + + /** + * 头像地址 + */ + @Schema(description = "头像地址") + private String headPic; + + /** + * 最后登录IP + */ + @Schema(description = "最后登录IP") + private String loginIp; + + /** + * 用户角色集合 + */ + @Schema(description = "用户角色集合") + private List userRoles; + + /** + * 用户菜单集合 + */ + @Schema(description = "用户菜单集合") + private List userMenus; + + /** + * 应用的全局配置 + */ + @Schema(description = "用户全局配置") + private List appConfigs; + + /** + * 最后登录时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Schema(description = "最后登录时间") + private LocalDateTime loginDate; + + /** + * 是否启用（0停用 1启用） + */ + @Schema(description = "是否启用（0停用 1启用）") + private Integer status; + + /** + * 是否删除（0正常 1删除） + */ + @Schema(description = "是否删除（0正常 1删除）") + private Integer deleted; + + /** + * 乐观锁 + */ + @Schema(description = "乐观锁") + private Long revision; + + /** + * 部门租户ID + */ + @Schema(description = "部门租户ID") + private String deptTenantId; + + /** + * 公司租户ID + */ + @Schema(description = "公司租户ID") + private String companyTenantId; + + /** + * 创建人 + */ + @Schema(description = "创建人") + private String createdBy; + + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Schema(description = "创建时间") + private LocalDateTime createdAt; + + /** + * 更新人 + */ + @Schema(description = "更新人") + private String updatedBy; + + /** + * 更新时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Schema(description = "更新时间") + private LocalDateTime updatedAt; + +} diff --git a/remi-demo/remi-demo-infra/pom.xml b/remi-demo/remi-demo-infra/pom.xml index 35be3a1..d7a22ed 100644 --- a/remi-demo/remi-demo-infra/pom.xml +++ b/remi-demo/remi-demo-infra/pom.xml @@ -7,35 +7,30 @@ remi-demo-infra - ai.remi.top.cloud + ai.remi.top.demo remi-demo - 3.1.1 + 3.1.0 - - - - maven-releases - release - https://repository.njydsz.com/repository/maven-releases/ - - - maven-snapshots - snapshot - https://repository.njydsz.com/repository/maven-snapshots/ - - - - ai.remi.top.cloud + ai.remi.top.comm remi-comm-jdbc - ai.remi.top.cloud + ai.remi.top.demo remi-demo-domain + + + org.slf4j + slf4j-simple + + + org.slf4j + slf4j-nop + diff --git a/remi-demo/remi-demo-infra/src/main/java/ai/remi/boot/infra/mapper/UserMapper.java b/remi-demo/remi-demo-infra/src/main/java/ai/remi/boot/infra/mapper/UserMapper.java new file mode 100644 index 0000000..4940573 --- /dev/null +++ b/remi-demo/remi-demo-infra/src/main/java/ai/remi/boot/infra/mapper/UserMapper.java @@ -0,0 +1,143 @@ +package ai.remi.boot.infra.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import ai.remi.boot.domain.entity.User; +import ai.remi.boot.domain.query.UserQuery; +import ai.remi.boot.domain.vo.UserVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author DianJiu + * @email dianjiuxyz@gmail.com + * @desc 用户表(User)数据层 + */ +@Mapper +public interface UserMapper extends BaseMapper { + + @Select("SELECT " + + " u.*, " + + " up.position_id, " + + " up.position_code, " + + " up.rank_id, " + + " up.rank_code, " + + " du.dept_id, " + + " du.dept_code, " + + " cd.company_id, " + + " cd.company_code " + + "FROM " + + " iam_user u, " + + " iam_user_post up, " + + " iam_dept_user du, " + + " iam_company_dept cd " + + "WHERE " + + " u.id = du.user_id " + + " and u.user_code = du.user_code " + + " and u.id = up.user_id " + + " and u.user_code = up.user_code " + + " and du.dept_id = cd.dept_id " + + " and du.dept_code = cd.dept_code " + + " and u.id = #{id}") + UserVO selectOneById(String id); + + @Select("") + List selectListByUser(@Param("userQuery") UserQuery userQuery); + + @Select("") + List selectPageByUser(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize, @Param("userQuery") UserQuery userQuery); + + @Select("") + Long selectCountByUser(@Param("userQuery") UserQuery userQuery); + +} diff --git a/remi-demo/remi-demo-job/README.md b/remi-demo/remi-demo-job/README.md index b43179e..d859101 100644 --- a/remi-demo/remi-demo-job/README.md +++ b/remi-demo/remi-demo-job/README.md @@ -9,7 +9,7 @@ xxl-job: # 执行器 executor: # 执行器AppName - appname: remi-demo-job + appname: remi-ids-job # 执行器注册地址 address: # 执行器IP @@ -17,7 +17,7 @@ xxl-job: # 执行器端口号 port: # 执行器运行日志文件存储磁盘路径 - logPath: /app/logs/remi-demo-job + logPath: /app/logs/remi-ids-job # 执行器日志文件保存天数 logRetentionDays: 30 ``` \ No newline at end of file diff --git a/remi-demo/remi-demo-job/pom.xml b/remi-demo/remi-demo-job/pom.xml index 0d59ebe..6f87311 100644 --- a/remi-demo/remi-demo-job/pom.xml +++ b/remi-demo/remi-demo-job/pom.xml @@ -7,36 +7,31 @@ remi-demo-job - ai.remi.top.cloud + ai.remi.top.demo remi-demo - 3.1.1 + 3.1.0 - - - - maven-releases - release - https://repository.njydsz.com/repository/maven-releases/ - - - maven-snapshots - snapshot - https://repository.njydsz.com/repository/maven-snapshots/ - - - - ai.remi.top.cloud + ai.remi.top.comm remi-comm-job - ai.remi.top.cloud + ai.remi.top.demo remi-demo-server + + + org.slf4j + slf4j-simple + + + org.slf4j + slf4j-nop + diff --git a/remi-sys/remi-sys-job/src/main/java/ai/remi/sys/job/handler/DemoJobHandler.java b/remi-demo/remi-demo-job/src/main/java/ai/remi/boot/job/handler/DemoJobHandler.java similarity index 99% rename from remi-sys/remi-sys-job/src/main/java/ai/remi/sys/job/handler/DemoJobHandler.java rename to remi-demo/remi-demo-job/src/main/java/ai/remi/boot/job/handler/DemoJobHandler.java index 5ba88fc..a7463fc 100644 --- a/remi-sys/remi-sys-job/src/main/java/ai/remi/sys/job/handler/DemoJobHandler.java +++ b/remi-demo/remi-demo-job/src/main/java/ai/remi/boot/job/handler/DemoJobHandler.java @@ -1,4 +1,4 @@ -package ai.remi.sys.job.handler; +package ai.remi.boot.job.handler; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.context.XxlJobHelper; diff --git a/remi-demo/remi-demo-server/pom.xml b/remi-demo/remi-demo-server/pom.xml index dfef1fb..d801206 100644 --- a/remi-demo/remi-demo-server/pom.xml +++ b/remi-demo/remi-demo-server/pom.xml @@ -7,52 +7,43 @@ remi-demo-server - ai.remi.top.cloud + ai.remi.top.demo remi-demo - 3.1.1 + 3.1.0 - - - - maven-releases - release - https://repository.njydsz.com/repository/maven-releases/ - - - maven-snapshots - snapshot - https://repository.njydsz.com/repository/maven-snapshots/ - - - - + - ai.remi.top.cloud - remi-demo-infra - - - - ai.remi.top.cloud + ai.remi.top.comm remi-comm-exception - ai.remi.top.cloud - remi-comm-minio - - - ai.remi.top.cloud + ai.remi.top.comm remi-comm-redis - ai.remi.top.cloud + ai.remi.top.comm remi-comm-thread - ai.remi.top.cloud + ai.remi.top.comm remi-comm-util + + + ai.remi.top.demo + remi-demo-infra + + + + org.slf4j + slf4j-simple + + + org.slf4j + slf4j-nop + diff --git a/remi-demo/remi-demo-server/src/main/java/ai/remi/demo/server/exception/BpmExceptionCode.java b/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/exception/IamExceptionCode.java similarity index 88% rename from remi-demo/remi-demo-server/src/main/java/ai/remi/demo/server/exception/BpmExceptionCode.java rename to remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/exception/IamExceptionCode.java index 403f78a..290765d 100644 --- a/remi-demo/remi-demo-server/src/main/java/ai/remi/demo/server/exception/BpmExceptionCode.java +++ b/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/exception/IamExceptionCode.java @@ -1,4 +1,4 @@ -package ai.remi.demo.server.exception; +package ai.remi.boot.server.exception; import ai.remi.comm.exception.enums.ExceptionCode; import lombok.AllArgsConstructor; @@ -6,7 +6,7 @@ import lombok.Getter; @AllArgsConstructor @Getter -public enum BpmExceptionCode implements ExceptionCode { +public enum IamExceptionCode implements ExceptionCode { /** * 业务异常code diff --git a/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/exception/IamServiceException.java b/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/exception/IamServiceException.java new file mode 100644 index 0000000..bcf7639 --- /dev/null +++ b/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/exception/IamServiceException.java @@ -0,0 +1,22 @@ +package ai.remi.boot.server.exception; + +import ai.remi.comm.exception.custom.BusinessException; + +public class IamServiceException extends BusinessException { + + public IamServiceException(String code, String message) { + super(code, message); + } + + public IamServiceException(String code, Throwable cause) { + super(code, cause); + } + + public IamServiceException(String code, String message, Throwable cause) { + super(code, message, cause); + } + + public IamServiceException(String code, String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { + super(code, message, cause, enableSuppression, writableStackTrace); + } +} diff --git a/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/service/UserService.java b/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/service/UserService.java new file mode 100644 index 0000000..2031801 --- /dev/null +++ b/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/service/UserService.java @@ -0,0 +1,19 @@ +package ai.remi.boot.server.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import ai.remi.boot.domain.entity.User; +import ai.remi.boot.domain.vo.UserVO; + +/** + * @author DianJiu + * @email dianjiuxyz@gmail.com + * @desc 用户表(User)服务定义层 + */ +public interface UserService extends IService { + + UserVO getLoginById(String id); + + UserVO getUserById(String id); + + User login(String username, String password); +} diff --git a/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/service/impl/UserServiceImpl.java b/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..8526632 --- /dev/null +++ b/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/service/impl/UserServiceImpl.java @@ -0,0 +1,176 @@ +package ai.remi.boot.server.service.impl; + +import ai.remi.boot.domain.entity.*; +import ai.remi.boot.domain.vo.UserVO; +import ai.remi.boot.infra.mapper.UserMapper; +import ai.remi.boot.server.service.*; +import ai.remi.comm.domain.tree.TreeBuild; +import ai.remi.comm.util.bean.BeanCopyUtils; +import ai.remi.comm.util.collection.CollectionUtils; +import ai.remi.comm.util.object.ObjectUtils; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @author DianJiu + * @email dianjiuxyz@gmail.com + * @desc 用户表(User)服务实现层 + */ +@Service("userService") +public class UserServiceImpl extends ServiceImpl implements UserService { + + @Resource + private UserMapper userMapper; + @Resource + private RoleService roleService; + @Resource + private UserRoleService userRoleService; + @Resource + private DeptUserService deptUserService; + @Resource + private CompanyDeptService companyDeptService; + @Resource + private CordRoleService cordRoleService; + @Resource + private UserPostService userPostService; + @Resource + private PostRoleService postRoleService; + @Resource + private GroupUserService groupUserService; + @Resource + private GroupRoleService groupRoleService; + @Resource + private RoleMenuService roleMenuService; + @Resource + private MenuMapper menuMapper; + @Resource + private ConfigService configService; + + @Override + public UserVO getLoginById(String id) { + UserVO userVO = userMapper.selectOneById(id); + // 获取用户角色 + List userRoles = getUserRoles(id); + userVO.setUserRoles(userRoles); + // 获取用户菜单 + List userMenus = getUserMenus(userRoles); + userVO.setUserMenus(userMenus); + // 用户全局配置 + List list = configService.list(Wrappers.lambdaQuery().eq(Config::getConfType, 1).eq(Config::getBindId, id)); + userVO.setAppConfigs(BeanCopyUtils.coverList(list, ConfigVO.class)); + return userVO; + } + + @Override + public UserVO getUserById(String id) { + UserVO userVO = userMapper.selectOneById(id); + // 获取用户角色 + List userRoles = getUserRoles(id); + userVO.setUserRoles(userRoles); + // 获取用户菜单 + //List userMenus = getUserMenus(userRoles); + //userVO.setUserMenus(userMenus); + return userVO; + } + + @Override + public User login(String username, String password) { + Wrapper queryWrapper = Wrappers.lambdaQuery().eq(User::getLoginName, username).eq(User::getPassword, password).eq(User::getStatus, 1).last("limit 1"); + User user = userMapper.selectOne(queryWrapper); + return user; + } + + private List getUserMenus(List userRoles) { + List list = new ArrayList<>(); + // 获取用户所有的菜单 + List roleMenus = roleMenuService.list(Wrappers.lambdaQuery().in(RoleMenu::getRoleId, userRoles.stream().map(a -> a.getId()).collect(Collectors.toList()))); + // 查询出所有菜单信息 + List menuTrees = menuMapper.selectMenuInIds(roleMenus.stream().map(a -> a.getMenuId()).collect(Collectors.toList()), 1); + Map> collect = menuTrees.stream().collect(Collectors.groupingBy(menuTree -> menuTree.getAppId())); + collect.forEach((key, value) -> { + AppMenuVO appMenuVO = new AppMenuVO(); + appMenuVO.setAppId(key); + if (CollectionUtils.isNotEmpty(value)) { + appMenuVO.setAppCode(value.get(0).getAppCode()); + String rootId = "0"; + // 创建树形结构并返回 + TreeBuild treeBuild = new TreeBuild(rootId, value); + appMenuVO.setMenuTree(treeBuild.buildTree()); + } + list.add(appMenuVO); + }); + return list; + } + + private List getUserRoles(String userId) { + List list = new ArrayList<>(); + // 1、基础角色 + List userRoles = userRoleService.list(Wrappers.lambdaQuery().eq(UserRole::getUserId, userId)); + if (CollectionUtils.isNotEmpty(userRoles)) { + for (UserRole userRole : userRoles) { + Role one = roleService.getOne(Wrappers.lambdaQuery().eq(Role::getId, userRole.getRoleId()).eq(Role::getRoleType, 1).last("limit 1")); + list.add(RoleConverter.INSTANT.entityToVO(one)); + } + } + // 组织角色 + // 所在部门角色 + DeptUser deptUser = deptUserService.getOne(Wrappers.lambdaQuery().eq(DeptUser::getUserId, userId).last("limit 1")); + List deptRoles = cordRoleService.list(Wrappers.lambdaQuery().eq(CordRole::getCordId, deptUser.getDeptId()).eq(CordRole::getCordType, 2)); + if (CollectionUtils.isNotEmpty(deptRoles)) { + for (CordRole cordRole : deptRoles) { + Role one = roleService.getOne(Wrappers.lambdaQuery().eq(Role::getId, cordRole.getRoleId()).eq(Role::getRoleType, 2).last("limit 1")); + list.add(RoleConverter.INSTANT.entityToVO(one)); + } + } + // 所在公司角色 + CompanyDept companyDept = companyDeptService.getOne(Wrappers.lambdaQuery().eq(CompanyDept::getDeptId, deptUser.getDeptId()).last("limit 1")); + List companyRoles = new ArrayList<>(); + if (ObjectUtils.isNotEmpty(companyDept)) { + companyRoles = cordRoleService.list(Wrappers.lambdaQuery().eq(CordRole::getCordId, companyDept.getCompanyId()).eq(CordRole::getCordType, 1)); + } + if (CollectionUtils.isNotEmpty(companyRoles)) { + for (CordRole cordRole : companyRoles) { + Role one = roleService.getOne(Wrappers.lambdaQuery().eq(Role::getId, cordRole.getRoleId()).eq(Role::getRoleType, 2).last("limit 1")); + list.add(RoleConverter.INSTANT.entityToVO(one)); + } + } + // 业务角色 + UserPost userPost = userPostService.getOne(Wrappers.lambdaQuery().eq(UserPost::getUserId, userId).last("limit 1")); + List postRoles = new ArrayList<>(); + if (ObjectUtils.isNotEmpty(userPost)) { + postRoles = postRoleService.list(Wrappers.lambdaQuery().eq(PostRole::getPostId, userPost.getPositionId())); + } + if (CollectionUtils.isNotEmpty(postRoles)) { + for (PostRole postRole : postRoles) { + Role one = roleService.getOne(Wrappers.lambdaQuery().eq(Role::getId, postRole.getRoleId()).eq(Role::getRoleType, 3).last("limit 1")); + list.add(RoleConverter.INSTANT.entityToVO(one)); + } + } + // 用户组角色 + List groupUsers = groupUserService.list(Wrappers.lambdaQuery().eq(GroupUser::getUserId, userId)); + List groupRoles = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(groupUsers)) { + groupRoles = groupRoleService.list(Wrappers.lambdaQuery().in(GroupRole::getGroupId, groupUsers.stream().map(a -> a.getGroupId()).collect(Collectors.toList()))); + } + if (CollectionUtils.isNotEmpty(groupRoles)) { + for (GroupRole groupRole : groupRoles) { + Role one = roleService.getOne(Wrappers.lambdaQuery().eq(Role::getId, groupRole.getRoleId()).eq(Role::getRoleType, 4).last("limit 1")); + list.add(RoleConverter.INSTANT.entityToVO(one)); + } + } + // 角色集合去重返回 + if (CollectionUtils.isNotEmpty(list)) { + return list.stream().distinct().collect(Collectors.toList()); + } + return list; + } +} + diff --git a/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/util/AppUtils.java b/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/util/AppUtils.java new file mode 100644 index 0000000..2eda593 --- /dev/null +++ b/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/util/AppUtils.java @@ -0,0 +1,178 @@ +package ai.remi.boot.server.util; + +import ai.remi.comm.exception.util.MessageUtils; +import ai.remi.comm.redis.service.RedisService; +import ai.remi.comm.util.asserts.AssertUtils; +import ai.remi.comm.util.id.RandomUtils; +import ai.remi.comm.util.id.UUIDUtils; +import ai.remi.comm.util.security.AesUtils; +import ai.remi.boot.domain.enums.SsoCacheEnum; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import javax.annotation.Resource; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.time.LocalDateTime; +import java.util.Arrays; + +; + +/** + * @author DianJiu + * @date 2021/12/8 + * @Description 随机产生唯一的app_key和app_secret + */ +@Component +public class AppUtils { + + @Resource + private RedisService redisService; + + public static RedisService redisUtils; + + @PostConstruct + public void init() { + redisUtils = this.redisService; + } + + private final static String[] chars = new String[]{"a", "b", "c", "d", "e", "f", + "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", + "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", + "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", + "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", + "W", "X", "Y", "Z"}; + + /** + * 最大重试次数 + */ + public static final int MAX_RETRY_COUNT = 10; + + /** + * 最大重试记录 + */ + public static int maxCount = 0; + + /** + * 生成规则 年份后两位【2位】 + 1年内第几天【3位】 + 随机数【5位】 + * 理论上来说，一百年内不会重复 + * 注意：1.前五位保证每天生成的id不重复，后五位会在redis缓存 set集合中进行碰撞校验， + * 2.请保证每天0时清除缓存，保证缓存中的短id数量较少提高性能，减少内存浪费 + */ + public static String getAppCode() { + String year = String.valueOf(LocalDateTime.now().getYear()).substring(2); + String day = String.valueOf(LocalDateTime.now().getDayOfYear()); + if (day.length() < 3) { + StringBuilder sb = new StringBuilder(); + for (int i = day.length(); i < 3; i++) { + sb.append("0"); + } + day = sb.append(day).toString(); + } + String code = year + day; + int count = 0; + boolean exists = true; + while (exists) { + if (count > maxCount) { + maxCount = count; + } + String random = RandomUtils.generateNumberString(10 - code.length()); + exists = redisUtils.sSet(SsoCacheEnum.APP_CODE.getKey(code, random), code + random) == 0L; + code = code + random; + count++; + AssertUtils.isFalse(count >= MAX_RETRY_COUNT, MessageUtils.getMessage("app.code.error")); + } + return code; + } + + /** + * @Description:

+ * 短8位UUID思想其实借鉴微博短域名的生成方式，但是其重复概率过高，而且每次生成4个，需要随即选取一个。 + * 本算法利用62个可打印字符，通过随机生成32位UUID，由于UUID都为十六进制，所以将UUID分成8组，每4个为一组，然后通过模62操作，结果作为索引取出字符， + * 这样重复率大大降低。 + * 经测试，在生成一千万个数据也没有出现重复，完全满足大部分需求。 + *

+ * @author DianJiu + * @date 2019/8/27 16:16 + */ + public static String getAppKey() { + StringBuffer shortBuffer = new StringBuffer(); + String uuid = UUIDUtils.simpleUuid(); + for (int i = 0; i < 8; i++) { + String str = uuid.substring(i * 4, i * 4 + 4); + int x = Integer.parseInt(str, 16); + shortBuffer.append(chars[x % 0x3E]); + } + return shortBuffer.toString().toLowerCase(); + + } + + /** + *

+ * 通过appId和内置关键词生成APP Secret + *

+ * + * @author DianJiu + * @date 2019/8/27 16:32 + */ + public static String getAppSecret() { + return AesUtils.initHexKey(); + } + + public static Boolean validate(String appKey,String appSecret) { + return appSecret.equals(getAppSecret(appKey)); + } + + /** + *

+ * 通过appId和内置关键词生成APP Secret + *

+ * + * @author DianJiu + * @date 2019/8/27 16:32 + */ + public static String getAppSecret(String appKey) { + try { + String[] array = new String[]{appKey}; + StringBuffer sb = new StringBuffer(); + // 字符串排序 + Arrays.sort(array); + for (int i = 0; i < array.length; i++) { + sb.append(array[i]); + } + String str = sb.toString(); + MessageDigest md = MessageDigest.getInstance("SHA-1"); + md.update(str.getBytes()); + byte[] digest = md.digest(); + + StringBuffer hexstr = new StringBuffer(); + String shaHex = ""; + for (int i = 0; i < digest.length; i++) { + shaHex = Integer.toHexString(digest[i] & 0xFF); + if (shaHex.length() < 2) { + hexstr.append(0); + } + hexstr.append(shaHex); + } + return hexstr.toString(); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + throw new RuntimeException(); + } + } + + + public static void main(String[] args) { + //for (int i = 0; i < 10000; i++) { + // getAppCode(); + //} + //System.out.println("最大碰撞次数为=>" + AppUtils.maxCount); + //String appCode = getAppCode(); + String appKey = getAppKey(); + String appSecret = getAppSecret(appKey); + //System.out.println("appCode: " + appCode); + System.out.println("appKey: " + appKey); + System.out.println("appSecret: " + appSecret); + } +} + diff --git a/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/util/AuthUtils.java b/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/util/AuthUtils.java new file mode 100644 index 0000000..57a65c0 --- /dev/null +++ b/remi-demo/remi-demo-server/src/main/java/ai/remi/boot/server/util/AuthUtils.java @@ -0,0 +1,21 @@ +package ai.remi.boot.server.util; + +import ai.remi.comm.util.security.Base64Utils; +import ai.remi.comm.util.string.StringUtils; +import org.springframework.util.DigestUtils; + +import java.nio.charset.StandardCharsets; + +public class AuthUtils { + public static String getAuthCode(String appKey, String state) { + String encode = Base64Utils.encode(appKey + state); + if (StringUtils.isNotBlank(encode)) { + return DigestUtils.md5DigestAsHex(encode.getBytes(StandardCharsets.UTF_8)); + } + return ""; + } + + public static void main(String[] args) { + System.out.println(getAuthCode("AB123CE","123456")); + } +} diff --git a/remi-demo/remi-demo-server/src/main/java/ai/remi/demo/server/exception/BpmServiceException.java b/remi-demo/remi-demo-server/src/main/java/ai/remi/demo/server/exception/BpmServiceException.java deleted file mode 100644 index faf6b60..0000000 --- a/remi-demo/remi-demo-server/src/main/java/ai/remi/demo/server/exception/BpmServiceException.java +++ /dev/null @@ -1,22 +0,0 @@ -package ai.remi.demo.server.exception; - -import ai.remi.comm.exception.custom.BusinessException; - -public class BpmServiceException extends BusinessException { - - public BpmServiceException(String code, String message) { - super(code, message); - } - - public BpmServiceException(String code, Throwable cause) { - super(code, cause); - } - - public BpmServiceException(String code, String message, Throwable cause) { - super(code, message, cause); - } - - public BpmServiceException(String code, String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(code, message, cause, enableSuppression, writableStackTrace); - } -} diff --git a/remi-demo/remi-demo-web/pom.xml b/remi-demo/remi-demo-web/pom.xml index 96476df..de6d2d6 100644 --- a/remi-demo/remi-demo-web/pom.xml +++ b/remi-demo/remi-demo-web/pom.xml @@ -7,26 +7,11 @@ remi-demo-web - ai.remi.top.cloud + ai.remi.top.demo remi-demo - 3.1.1 + 3.1.0 - - - - maven-releases - release - https://repository.njydsz.com/repository/maven-releases/ - - - maven-snapshots - snapshot - https://repository.njydsz.com/repository/maven-snapshots/ - - - - @@ -35,15 +20,17 @@ org.slf4j - slf4j-log4j12 + slf4j-simple + + + org.slf4j + slf4j-nop - - - org.springframework.boot - spring-boot-starter-logging + ch.qos.logback + logback-classic @@ -84,33 +71,34 @@ - ai.remi.top.cloud + ai.remi.top.comm remi-comm-web - - ai.remi.top.cloud + - + - ai.remi.top.cloud + ai.remi.top.demo remi-demo-server - + - ai.remi.top.cloud + ai.remi.top.demo remi-demo-job - ai.remi.top.cloud + ai.remi.top.demo remi-demo-api + diff --git a/remi-demo/remi-demo-web/src/main/java/ai/remi/demo/web/Application.java b/remi-demo/remi-demo-web/src/main/java/ai/remi/boot/web/Application.java similarity index 78% rename from remi-demo/remi-demo-web/src/main/java/ai/remi/demo/web/Application.java rename to remi-demo/remi-demo-web/src/main/java/ai/remi/boot/web/Application.java index 2ce141b..74cbc74 100644 --- a/remi-demo/remi-demo-web/src/main/java/ai/remi/demo/web/Application.java +++ b/remi-demo/remi-demo-web/src/main/java/ai/remi/boot/web/Application.java @@ -1,4 +1,4 @@ -package ai.remi.demo.web; +package ai.remi.boot.web; import ai.remi.comm.feign.annotation.EnableRemiFeignClients; import org.springframework.boot.SpringApplication; @@ -10,7 +10,7 @@ import org.springframework.jmx.support.RegistrationPolicy; /** * 系统服务启动程序 */ - //@EnableLogRecord +//@EnableLogRecord @EnableDiscoveryClient @EnableRemiFeignClients @SpringBootApplication(scanBasePackages = "ai.remi") @@ -18,10 +18,11 @@ import org.springframework.jmx.support.RegistrationPolicy; public class Application { public static void main(String[] args) { + //System.setProperty("cfg.env","local"); SpringApplication.run(Application.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ Sdt Boot Web Startup Completed! ლ(´ڡ`ლ)ﾞ "); + System.out.println("(♥◠‿◠)ﾉﾞ Remi Demo Web Startup Completed! ლ(´ڡ`ლ)ﾞ "); } diff --git a/remi-demo/remi-demo-web/src/main/java/ai/remi/boot/web/controller/UserController.java b/remi-demo/remi-demo-web/src/main/java/ai/remi/boot/web/controller/UserController.java new file mode 100644 index 0000000..26f2581 --- /dev/null +++ b/remi-demo/remi-demo-web/src/main/java/ai/remi/boot/web/controller/UserController.java @@ -0,0 +1,202 @@ +package ai.remi.boot.web.controller; + + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import ai.remi.comm.core.result.PagerBean; +import ai.remi.comm.core.result.ResultBean; +import ai.remi.comm.domain.query.PageQuery; +import ai.remi.comm.exception.util.MessageUtils; +import ai.remi.comm.redis.service.RedisService; +import ai.remi.comm.util.asserts.AssertUtils; +import ai.remi.comm.util.collection.CollectionUtils; +import ai.remi.comm.util.id.SnowflakeUtils; +import ai.remi.boot.domain.converter.UserConverter; +import ai.remi.boot.domain.dto.post.UserPostDTO; +import ai.remi.boot.domain.dto.put.UserPutDTO; +import ai.remi.boot.domain.entity.User; +import ai.remi.boot.domain.enums.SsoCacheEnum; +import ai.remi.boot.domain.query.UserQuery; +import ai.remi.boot.domain.vo.UserVO; +import ai.remi.boot.infra.mapper.UserMapper; +import ai.remi.boot.server.service.UserService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.constraints.NotBlank; +import java.util.List; +import java.util.Map; + +/** + * @author DianJiu + * @email dianjiuxyz@gmail.com + * @desc 用户表(User)控制层 + */ +@Validated +@RestController +@Tag(name = "用户管理") +@RequestMapping("user") +public class UserController { + + /** + * 服务对象 + */ + @Resource + private RedisService redisService; + @Resource + private UserService userService; + @Resource + private UserMapper userMapper; + @Resource + private DeptUserService deptUserService; + @Resource + private UserPostService userPostService; + + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + @Operation(summary = "通过userId获取用户信息") + public ResultBean get(@PathVariable @Validated @NotBlank(message = "ID不能为空") String id) { + UserVO userVO = userService.getUserById(id); + return ResultBean.success(userVO); + } + + /** + * 通过主键查询单条数据 + * + * @param token 主键 + * @return 单条数据 + */ + @GetMapping("token/{token}") + @Operation(summary = "通过Token获取用户信息") + public ResultBean getUserByToken(@PathVariable @Validated @NotBlank(message = "Token不能为空") String token) throws Exception { + Map hmget = redisService.hmget(SsoCacheEnum.USER_INFO.getKey(token)); + AssertUtils.isTrue(CollectionUtils.isNotEmpty(hmget), MessageUtils.getMessage("check.userinfo.token.error")); + return ResultBean.success(BeanUtil.toBean(hmget, UserVO.class)); + } + + /** + * 通过实体不为空的属性作为筛选条件查询对象列表 + * + * @param userQuery 实例对象 + * @return 对象列表 + */ + @PostMapping(value = "/list") + @Operation(summary = "查询所有") + public ResultBean> list(@RequestBody UserQuery userQuery) { + //执行分页查询 + List listResult = userMapper.selectListByUser(userQuery); + return ResultBean.success(listResult); + } + + /** + * 分页查询所有数据 + * + * @param pageQuery 分页对象 + * @param userQuery 查询实体 + * @return 分页对象 + */ + @PostMapping(value = "/page") + @Operation(summary = "分页查询") + public ResultBean> page(PageQuery pageQuery, UserQuery userQuery) { + //查询总条数 + Long total = userMapper.selectCountByUser(userQuery); + //执行分页查询 + List userVOS = userMapper.selectPageByUser(pageQuery.getPageNum() - 1, pageQuery.getPageSize(), userQuery); + PagerBean pageBean = new PagerBean<>(total, Long.valueOf(pageQuery.getPageNum()), Long.valueOf(pageQuery.getPageSize()), userVOS); + return ResultBean.success(pageBean); + } + + /** + * 新增数据 + * + * @param userDTO 实体对象 + * @return 新增结果 + */ + @PostMapping("/add") + @Operation(summary = "新增数据") + //@LogRecord(content = "录入用户信息", businessType = BusinessType.INSERT) + @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") + public ResultBean insert(@RequestBody @Validated UserPostDTO userDTO) { + //处理格式转换 + User user = UserConverter.INSTANT.postDtoToEntity(userDTO); + user.setId(SnowflakeUtils.getInstance().nextIdStr()); + //保存部门用户中间表 + DeptUser deptUser = DeptUser.builder() + .deptId(userDTO.getDeptId()) + .deptCode(userDTO.getDeptCode()) + .userId(user.getId()).userCode(user.getUserCode()).build(); + deptUserService.save(deptUser); + // 保存用户职位职级（即岗位） + UserPost userPost = UserPost.builder() + .positionId(userDTO.getPositionId()).positionCode(userDTO.getPositionCode()) + .rankId(userDTO.getRankId()).rankCode(userDTO.getRankCode()) + .userId(user.getId()).userCode(user.getUserCode()).build(); + userPostService.save(userPost); + //执行用户信息保存 + return ResultBean.success(userService.save(user)); + } + + /** + * 修改数据 + * + * @param userDTO 实体对象 + * @return 修改结果 + */ + @PutMapping("/update") + @Operation(summary = "修改数据") + //@LogRecord(content = "更新用户信息", businessType = BusinessType.UPDATE) + @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") + public ResultBean update(@RequestBody @Validated UserPutDTO userDTO) { + //处理格式转换 + User user = UserConverter.INSTANT.putDtoToEntity(userDTO); + //保存公司部门中间表 + DeptUser deptUser = DeptUser.builder() + .deptId(userDTO.getDeptId()) + .deptCode(userDTO.getDeptCode()) + .userId(user.getId()).userCode(user.getUserCode()).build(); + deptUserService.saveOrUpdate(deptUser, Wrappers.lambdaUpdate().eq(DeptUser::getUserId, userDTO.getId())); + // 保存用户职位职级（即岗位） + UserPost userPost = UserPost.builder() + .positionId(userDTO.getPositionId()).positionCode(userDTO.getPositionCode()) + .rankId(userDTO.getRankId()).rankCode(userDTO.getRankCode()) + .userId(user.getId()).userCode(user.getUserCode()).build(); + userPostService.saveOrUpdate(userPost, Wrappers.lambdaUpdate().eq(UserPost::getUserId, userDTO.getId())); + //执行数据更新 + return ResultBean.success(userService.updateById(user)); + } + + /** + * 删除数据 + * + * @param ids 主键结合 + * @return 删除结果 + */ + @DeleteMapping("/delete") + @Operation(summary = "删除数据") + //@LogRecord(content = "删除用户信息", businessType = BusinessType.DELETE) + @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") + public ResultBean delete(@RequestParam("ids") List ids) { + for (String id : ids) { + // 删除部门用户中间表 + LambdaQueryWrapper deptUserQuery = Wrappers.lambdaQuery(DeptUser.class).eq(DeptUser::getUserId, id); + deptUserService.remove(deptUserQuery); + // 删除用户岗位中间表 + LambdaQueryWrapper userPostQuery = Wrappers.lambdaQuery(UserPost.class).eq(UserPost::getUserId, id); + userPostService.remove(userPostQuery); + } + return ResultBean.success(userService.removeByIds(ids)); + } + +} + diff --git a/remi-demo/remi-demo-web/src/main/resources/bootstrap.yml b/remi-demo/remi-demo-web/src/main/resources/bootstrap.yml index 7bb5970..f10c5d4 100644 --- a/remi-demo/remi-demo-web/src/main/resources/bootstrap.yml +++ b/remi-demo/remi-demo-web/src/main/resources/bootstrap.yml @@ -7,6 +7,7 @@ spring: name: remi-demo-web profiles: active: dev + #active: sit cloud: # nacos nacos: @@ -15,11 +16,14 @@ spring: password: nacos discovery: # 配置中心的地址 - server-addr: ${NACOS_HOST:192.168.31.204}:${NACOS_PORT:8848} + #server-addr: ${NACOS_HOST:192.168.31.18}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:192.168.31.200}:${NACOS_PORT:30888} #命名空间 namespace: ${SERVICE_NAME_SPACE_NAME:dev} + #namespace: ${SERVICE_NAME_SPACE_NAME:sit} # 配置文件的环境 group: ${SERVICE_DISCOVERY_GROUP_NAME:dev} + #group: ${SERVICE_DISCOVERY_GROUP_NAME:sit} # 配置中心 config: # 配置中心的地址 @@ -42,4 +46,7 @@ spring: - dataId: remi-cloud-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} group: ${spring.cloud.nacos.discovery.group} #是否自动刷新 - refresh: true \ No newline at end of file + refresh: true + + + diff --git a/remi-demo/remi-demo-web/src/main/resources/docker/Dockerfile b/remi-demo/remi-demo-web/src/main/resources/docker/Dockerfile index 6919f6c..2a0fdd0 100644 --- a/remi-demo/remi-demo-web/src/main/resources/docker/Dockerfile +++ b/remi-demo/remi-demo-web/src/main/resources/docker/Dockerfile @@ -3,14 +3,12 @@ # Author: DianJiu # 指定基础镜像，这是分阶段构建的前期阶段 FROM harbor.njydsz.com/library/jdk:17 as builder -# 维护者 -MAINTAINER DianJiu #VOLUME：挂载目录 VOLUME /temp #ADD 将app.jar文件将拷贝到容器中，默认拷贝到根路径下 #也可以直接写成ADD app.jar /app.jar 或者 ADD app.jar / -ADD remi-demo-web-3.1.1.jar remi-demo-web.jar +ADD remi-demo-web-3.1.0.jar remi-demo-web.jar #修改app.jar这个文件的访问时间和修改时间为当前时间，而不会修改文件的内容。 RUN bash -c "touch /remi-demo-web.jar" @@ -21,4 +19,4 @@ RUN bash -c "touch /remi-demo-web.jar" ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/remi-demo-web.jar"] #EXPOSE 容器暴露端口 -EXPOSE 8080 +EXPOSE 1010 diff --git a/remi-demo/remi-demo-web/src/main/resources/docker/README.md b/remi-demo/remi-demo-web/src/main/resources/docker/README.md index c5113c5..31715b4 100644 --- a/remi-demo/remi-demo-web/src/main/resources/docker/README.md +++ b/remi-demo/remi-demo-web/src/main/resources/docker/README.md @@ -1,5 +1,7 @@ + +## 如果基于Docker部署项目 直接运行如下脚本即可 ```shell sh ./docker_deploy.sh docker logs -f remi-demo-web -``` \ No newline at end of file +``` diff --git a/remi-demo/remi-demo-web/src/main/resources/docker/docker_deploy.sh b/remi-demo/remi-demo-web/src/main/resources/docker/docker_deploy.sh index a1b3c15..07b239e 100644 --- a/remi-demo/remi-demo-web/src/main/resources/docker/docker_deploy.sh +++ b/remi-demo/remi-demo-web/src/main/resources/docker/docker_deploy.sh @@ -1,7 +1,12 @@ -docker stop remi-demo-web -docker rm -f remi-demo-web -docker rmi remi-demo-web +#先删除原有的镜像 +docker images | grep remi-demo-web | awk '{print $3}' | xargs docker rmi -f docker build -t remi-demo-web . -docker images -docker run --restart=always -t -dit -p 8080:8080 -e TZ="Asia/Shanghai" --name remi-demo-web remi-demo-web -docker ps +docker images | grep remi-demo-web +#把新镜像推送到私服 +docker login -uadmin -pRemi123 harbor.******.com +docker tag remi-demo-web harbor.******.com/remi-top/remi-demo-web:3.1.0 +docker tag remi-demo-web harbor.******.com/remi-top/remi-demo-web +docker push harbor.******.com/remi-top/remi-demo-web:3.1.0 +docker push harbor.******.com/remi-top/remi-demo-web +#基于Docker启动容器 +docker run --restart=always -t -dit -p 1010:1010 --name remi-demo-web harbor.******.com/remi-top/remi-demo-web diff --git a/remi-demo/remi-demo-web/src/main/resources/i18n/messages_en_US.properties b/remi-demo/remi-demo-web/src/main/resources/i18n/messages_en_US.properties index d8a5f07..a640140 100644 --- a/remi-demo/remi-demo-web/src/main/resources/i18n/messages_en_US.properties +++ b/remi-demo/remi-demo-web/src/main/resources/i18n/messages_en_US.properties @@ -5,6 +5,22 @@ not.logged.in=not logged in or token is invalid #****************************????**************************** system.error=System error assert.error=Verify error +add.dept.error=The same department already exists? +delete.dept.error=There are sub-dept or user under the current dept that have not been removed? +delete.company.error=There are sub-company or dept under the current company that have not been removed? +only.support.code.error=Only the authorization code method is supported +check.app.secret.error=Verify the appSecret is exceptional +check.auth.code.error=The code is incorrect or out of date +check.userinfo.token.error=The Token is incorrect or out of date +check.ticket.error=No ticket exist, please log in again +app.code.error=Generate an AppCode that collides more than 10 times, please regenerate it +add.menu.error=The same menu already exists? +add.groupUser.error=The same user {0} already exists? +add.roleUser.error=The same user {0} already exists? +add.roleCord.error=The same cord {0} already exists? +add.rolePost.error=The same post {0} already exists? +add.roleGroup.error=The same group {0} already exists? +check.login.error=The username or password is wrong, please check and try again! #****************************????**************************** other.system.error=Other system error call.feign.error=Call feign error diff --git a/remi-demo/remi-demo-web/src/main/resources/i18n/messages_zh_CN.properties b/remi-demo/remi-demo-web/src/main/resources/i18n/messages_zh_CN.properties index e83db0c..76a2df1 100644 --- a/remi-demo/remi-demo-web/src/main/resources/i18n/messages_zh_CN.properties +++ b/remi-demo/remi-demo-web/src/main/resources/i18n/messages_zh_CN.properties @@ -6,6 +6,22 @@ not.logged.in=未登录或Token失效 #****************************系统异常**************************** system.error=系统异常 assert.error=校验失败 +add.dept.error=当前公司下已存在相同部门，请检查部门名称和部门编码！ +delete.dept.error=当前部门下有子部门或员工未移除，不允许直接被删除！ +delete.company.error=当前公司下有子子公司或部门未移除，不允许直接被删除！ +only.support.code.error=仅支持授权码方式 +check.app.secret.error=校验appSecret异常 +check.auth.code.error=code有误或已过期 +check.userinfo.token.error=token有误或已过期 +check.ticket.error=不存在凭证，请重新登陆 +app.code.error=尝试生成AppCode发生碰撞超过10次，请重新生成！ +add.menu.error=当前应用下已存在相同菜单，请检查菜单名称和菜单编码！ +add.groupUser.error=当前用户组下已存在该用户，请检查用户:{0}！ +add.roleUser.error=当前角色下已存在该用户，请检查用户:{0}！ +add.roleCord.error=当前角色下已存在该组织，请检查组织:{0}！ +add.rolePost.error=当前角色下已存在该岗位，请检查岗位:{0}！ +add.roleGroup.error=当前角色下已存在该用户组，请检查用户组:{0}！ +check.login.error=用户名或密码错误，请检查后重试！ #****************************三方异常**************************** other.system.error=三方系统异常 call.feign.error=调用Feign异常 diff --git a/remi-sys/remi-sys-app/src/main/resources/docker/Dockerfile b/remi-demo/remi-demo-web/src/main/resources/k8s/Dockerfile similarity index 86% rename from remi-sys/remi-sys-app/src/main/resources/docker/Dockerfile rename to remi-demo/remi-demo-web/src/main/resources/k8s/Dockerfile index b39ffea..2a0fdd0 100644 --- a/remi-sys/remi-sys-app/src/main/resources/docker/Dockerfile +++ b/remi-demo/remi-demo-web/src/main/resources/k8s/Dockerfile @@ -8,15 +8,15 @@ VOLUME /temp #ADD 将app.jar文件将拷贝到容器中，默认拷贝到根路径下 #也可以直接写成ADD app.jar /app.jar 或者 ADD app.jar / -ADD remi-sys-app-3.1.0.jar remi-sys-app.jar +ADD remi-demo-web-3.1.0.jar remi-demo-web.jar #修改app.jar这个文件的访问时间和修改时间为当前时间，而不会修改文件的内容。 -RUN bash -c "touch /remi-sys-app.jar" +RUN bash -c "touch /remi-demo-web.jar" #ENTRYPOINT 应用启动命令 参数设定 #由于tomcat的session id的生成主要通过java.security.SecureRandom生成随机数来实现，导致启动过程很慢 #通过-Djava.security.egd=file:/dev/./urandom参数可以加快随机数产生过程 -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/remi-sys-app.jar"] +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/remi-demo-web.jar"] #EXPOSE 容器暴露端口 -EXPOSE 1020 +EXPOSE 1010 diff --git a/remi-sys/remi-sys-web/src/main/resources/k8s/README.md b/remi-demo/remi-demo-web/src/main/resources/k8s/README.md similarity index 57% rename from remi-sys/remi-sys-web/src/main/resources/k8s/README.md rename to remi-demo/remi-demo-web/src/main/resources/k8s/README.md index 174a117..4a1e2a4 100644 --- a/remi-sys/remi-sys-web/src/main/resources/k8s/README.md +++ b/remi-demo/remi-demo-web/src/main/resources/k8s/README.md @@ -7,7 +7,7 @@ sh ./k8s_deploy.sh kubectl get pods -n remi-top -kubectl describe pod dev-remi-sys-web -n remi-top +kubectl describe pod remi-demo-web -n remi-top -kubectl get deployment dev-remi-sys-web -n remi-top -o yaml +kubectl get deployment remi-demo-web -n remi-top -o yaml ``` diff --git a/remi-sys/remi-sys-app/src/main/resources/k8s/dev-remi-sys-web.yaml b/remi-demo/remi-demo-web/src/main/resources/k8s/dev-remi-sys-web.yaml similarity index 72% rename from remi-sys/remi-sys-app/src/main/resources/k8s/dev-remi-sys-web.yaml rename to remi-demo/remi-demo-web/src/main/resources/k8s/dev-remi-sys-web.yaml index 12afbb3..9709e8f 100644 --- a/remi-sys/remi-sys-app/src/main/resources/k8s/dev-remi-sys-web.yaml +++ b/remi-demo/remi-demo-web/src/main/resources/k8s/dev-remi-sys-web.yaml @@ -2,43 +2,43 @@ apiVersion: v1 kind: Service metadata: - name: dev-remi-sys-app + name: remi-demo-web labels: - app: dev-remi-sys-app + app: remi-demo-web spec: type: NodePort ports: - - name: dev-remi-sys-app - port: 1020 + - name: remi-demo-web + port: 1010 protocol: TCP - targetPort: 1020 - nodePort: 30020 + targetPort: 1010 + nodePort: 30010 selector: - app: dev-remi-sys-app + app: remi-demo-web --- ## Deployment apiVersion: apps/v1 kind: Deployment metadata: - name: dev-remi-sys-app + name: remi-demo-web labels: - app: dev-remi-sys-app + app: remi-demo-web spec: replicas: 2 selector: matchLabels: - app: dev-remi-sys-app + app: remi-demo-web template: metadata: labels: - app: dev-remi-sys-app + app: remi-demo-web spec: containers: - - image: harbor.******.com/remi-top/dev-remi-sys-app + - image: harbor.******.com/remi-top/remi-demo-web imagePullPolicy: Always - name: dev-remi-sys-app + name: remi-demo-web ports: - - containerPort: 1020 + - containerPort: 1010 protocol: TCP env: - name: NACOS_HOST diff --git a/remi-demo/remi-demo-web/src/main/resources/k8s/docker_deploy.sh b/remi-demo/remi-demo-web/src/main/resources/k8s/docker_deploy.sh new file mode 100644 index 0000000..7ac7e6c --- /dev/null +++ b/remi-demo/remi-demo-web/src/main/resources/k8s/docker_deploy.sh @@ -0,0 +1,10 @@ +#先删除原有的镜像 +docker images | grep remi-demo-web | awk '{print $3}' | xargs docker rmi -f +docker build -t remi-demo-web . +docker images | grep remi-demo-web +#把新镜像推送到私服 +docker login -uadmin -pRemi123 harbor.******.com +docker tag remi-demo-web harbor.******.com/remi-top/remi-demo-web:3.1.0 +docker tag remi-demo-web harbor.******.com/remi-top/remi-demo-web +docker push harbor.******.com/remi-top/remi-demo-web:3.1.0 +docker push harbor.******.com/remi-top/remi-demo-web diff --git a/remi-demo/remi-demo-web/src/main/resources/k8s/k8s_deploy.sh b/remi-demo/remi-demo-web/src/main/resources/k8s/k8s_deploy.sh new file mode 100644 index 0000000..6f3cbc2 --- /dev/null +++ b/remi-demo/remi-demo-web/src/main/resources/k8s/k8s_deploy.sh @@ -0,0 +1,5 @@ +#先删除原有的Pod +kubectl delete deployment remi-demo-web -n remi-top --grace-period=0 --force +kubectl delete svc remi-demo-web -n remi-top +#启动新的Pod +kubectl create -f remi-demo-web.yaml -n remi-top \ No newline at end of file diff --git a/remi-nacos/pom.xml b/remi-nacos/pom.xml index e8bc4ef..2fa10f7 100644 --- a/remi-nacos/pom.xml +++ b/remi-nacos/pom.xml @@ -11,7 +11,7 @@ ai.remi.top.cloud remi-cloud - 3.1.1 + 3.1.0 diff --git a/remi-sys/pom.xml b/remi-sys/pom.xml deleted file mode 100644 index c2c98ae..0000000 --- a/remi-sys/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - remi-sys - remi-sys - pom - 瑞米平台-身份权限 - - - ai.remi.top.cloud - remi-cloud - 3.1.1 - - - - 17 - ${java.version} - ${java.version} - UTF-8 - - - - - - maven-releases - release - https://repository.njydsz.com/repository/maven-releases/ - - - maven-snapshots - snapshot - https://repository.njydsz.com/repository/maven-snapshots/ - - - - - remi-sys-domain - remi-sys-infra - remi-sys-server - remi-sys-job - remi-sys-app - remi-sys-api - remi-sys-web - - - diff --git a/remi-sys/remi-sys-api/pom.xml b/remi-sys/remi-sys-api/pom.xml deleted file mode 100644 index c36210b..0000000 --- a/remi-sys/remi-sys-api/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - remi-sys-api - remi-sys-api - remi-sys-api - - - ai.remi.top.cloud - remi-sys - 3.1.1 - - - - - - maven-releases - release - https://repository.njydsz.com/repository/maven-releases/ - - - maven-snapshots - snapshot - https://repository.njydsz.com/repository/maven-snapshots/ - - - - - - - ai.remi.top.cloud - remi-comm-feign - - - - ai.remi.top.cloud - remi-sys-domain - - - - javax.servlet - javax.servlet-api - - - - org.projectlombok - lombok - - - - - diff --git a/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/factory/SysClientFactory.java b/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/factory/SysClientFactory.java deleted file mode 100644 index 5859c66..0000000 --- a/remi-sys/remi-sys-api/src/main/java/ai/remi/sys/api/factory/SysClientFactory.java +++ /dev/null @@ -1,18 +0,0 @@ -package ai.remi.sys.api.factory; - -import ai.remi.sys.api.client.SysClientApi; -import ai.remi.sys.api.fallback.SysClientFallback; -import org.springframework.cloud.openfeign.FallbackFactory; -import org.springframework.stereotype.Component; - -@Component -public class SysClientFactory implements FallbackFactory { - - @Override - public SysClientApi create(Throwable cause) { - SysClientFallback fallback = new SysClientFallback(); - fallback.setCause(cause); - return fallback; - } -} - diff --git a/remi-sys/remi-sys-app/src/main/resources/docker/docker_deploy.sh b/remi-sys/remi-sys-app/src/main/resources/docker/docker_deploy.sh deleted file mode 100644 index d5b475d..0000000 --- a/remi-sys/remi-sys-app/src/main/resources/docker/docker_deploy.sh +++ /dev/null @@ -1,12 +0,0 @@ -#先删除原有的镜像 -docker images | grep dev-remi-sys-app | awk '{print $3}' | xargs docker rmi -f -docker build -t dev-remi-sys-app . -docker images | grep dev-remi-sys-app -#把新镜像推送到私服 -docker login -uadmin -pRemi123 harbor.******.com -docker tag dev-remi-sys-app harbor.******.com/remi-top/dev-remi-sys-app:3.1.0 -docker tag dev-remi-sys-app harbor.******.com/remi-top/dev-remi-sys-app -docker push harbor.******.com/remi-top/dev-remi-sys-app:3.1.0 -docker push harbor.******.com/remi-top/dev-remi-sys-app -#基于Docker启动容器 -docker run --restart=always -t -dit -p 1020:1020 --name dev-remi-sys-app harbor.******.com/remi-top/dev-remi-sys-app diff --git a/remi-sys/remi-sys-app/src/main/resources/k8s/docker_deploy.sh b/remi-sys/remi-sys-app/src/main/resources/k8s/docker_deploy.sh deleted file mode 100644 index aa3810a..0000000 --- a/remi-sys/remi-sys-app/src/main/resources/k8s/docker_deploy.sh +++ /dev/null @@ -1,10 +0,0 @@ -#先删除原有的镜像 -docker images | grep dev-remi-sys-app | awk '{print $3}' | xargs docker rmi -f -docker build -t dev-remi-sys-app . -docker images | grep dev-remi-sys-app -#把新镜像推送到私服 -docker login -uadmin -pRemi123 harbor.******.com -docker tag dev-remi-sys-app harbor.******.com/remi-top/dev-remi-sys-app:3.1.0 -docker tag dev-remi-sys-app harbor.******.com/remi-top/dev-remi-sys-app -docker push harbor.******.com/remi-top/dev-remi-sys-app:3.1.0 -docker push harbor.******.com/remi-top/dev-remi-sys-app diff --git a/remi-sys/remi-sys-app/src/main/resources/k8s/k8s_deploy.sh b/remi-sys/remi-sys-app/src/main/resources/k8s/k8s_deploy.sh deleted file mode 100644 index 628fc1f..0000000 --- a/remi-sys/remi-sys-app/src/main/resources/k8s/k8s_deploy.sh +++ /dev/null @@ -1,5 +0,0 @@ -#先删除原有的Pod -kubectl delete deployment dev-remi-sys-app -n remi-top --grace-period=0 --force -kubectl delete svc dev-remi-sys-app -n remi-top -#启动新的Pod -kubectl create -f dev-remi-sys-app.yaml -n remi-top \ No newline at end of file diff --git a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/OidcConstant.java b/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/OidcConstant.java deleted file mode 100644 index ecf84ef..0000000 --- a/remi-sys/remi-sys-domain/src/main/java/ai/remi/sys/domain/constant/OidcConstant.java +++ /dev/null @@ -1,4 +0,0 @@ -package ai.remi.sys.domain.constant; - -public class OidcConstant { -} diff --git a/remi-sys/remi-sys-infra/pom.xml b/remi-sys/remi-sys-infra/pom.xml deleted file mode 100644 index 6fe42d2..0000000 --- a/remi-sys/remi-sys-infra/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - 4.0.0 - remi-sys-infra - remi-sys-infra - remi-sys-infra - - - ai.remi.top.cloud - remi-sys - 3.1.1 - - - - - - maven-releases - release - https://repository.njydsz.com/repository/maven-releases/ - - - maven-snapshots - snapshot - https://repository.njydsz.com/repository/maven-snapshots/ - - - - - - - ai.remi.top.cloud - remi-comm-jdbc - - - - ai.remi.top.cloud - remi-sys-domain - - - - org.slf4j - slf4j-simple - - - org.slf4j - slf4j-nop - - - diff --git a/remi-sys/remi-sys-job/pom.xml b/remi-sys/remi-sys-job/pom.xml deleted file mode 100644 index c509abd..0000000 --- a/remi-sys/remi-sys-job/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - remi-sys-job - remi-sys-job - remi-sys-job - - - ai.remi.top.cloud - remi-sys - 3.1.1 - - - - - - maven-releases - release - https://repository.njydsz.com/repository/maven-releases/ - - - maven-snapshots - snapshot - https://repository.njydsz.com/repository/maven-snapshots/ - - - - - - - ai.remi.top.cloud - remi-comm-job - - - - ai.remi.top.cloud - remi-sys-server - - - - org.slf4j - slf4j-simple - - - org.slf4j - slf4j-nop - - - - diff --git a/remi-sys/remi-sys-server/pom.xml b/remi-sys/remi-sys-server/pom.xml deleted file mode 100644 index 3a403cd..0000000 --- a/remi-sys/remi-sys-server/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - 4.0.0 - remi-sys-server - remi-sys-server - remi-sys-server - - - ai.remi.top.cloud - remi-sys - 3.1.1 - - - - - - maven-releases - release - https://repository.njydsz.com/repository/maven-releases/ - - - maven-snapshots - snapshot - https://repository.njydsz.com/repository/maven-snapshots/ - - - - - - - ai.remi.top.cloud - remi-sys-infra - - - - ai.remi.top.cloud - remi-comm-exception - - - ai.remi.top.cloud - remi-comm-minio - - - ai.remi.top.cloud - remi-comm-redis - - - ai.remi.top.cloud - remi-comm-thread - - - ai.remi.top.cloud - remi-comm-util - - - - org.slf4j - slf4j-simple - - - org.slf4j - slf4j-nop - - - - - diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/BucketController.java b/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/BucketController.java deleted file mode 100644 index 49692fa..0000000 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/BucketController.java +++ /dev/null @@ -1,135 +0,0 @@ -package ai.remi.sys.web.controller; - - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.xiaoymin.knife4j.annotations.ApiSort; -import ai.remi.comm.core.result.ResultBean; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; -import ai.remi.comm.minio.domian.BucketS3; -import ai.remi.comm.minio.service.MinIOService; -import ai.remi.comm.util.bean.BeanCopyUtils; -import ai.remi.sys.domain.converter.BucketConverter; -import ai.remi.sys.domain.dto.post.BucketPostDTO; -import ai.remi.sys.domain.dto.put.BucketPutDTO; -import ai.remi.sys.domain.entity.Bucket; -import ai.remi.sys.domain.query.BucketQuery; -import ai.remi.sys.domain.vo.BucketVO; -import ai.remi.sys.server.service.BucketService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.constraints.NotBlank; -import java.util.List; - -/** - * @author DianJiu - * @email dianjiuxyz@gmail.com - * @desc 存储桶管理(Bucket)控制层 - */ -@Validated -@RestController -@ApiSort(value = 1) -@Tag(name = "存储桶管理") -@RequestMapping("bucket") -public class BucketController { - /** - * 服务对象 - */ - @Resource - private BucketService bucketService; - - @Resource - MinIOService minIOService; - - - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @GetMapping("{id}") - @Operation(summary = "查询单条") - public ResultBean get(@PathVariable @Validated @NotBlank(message = "ID不能为空") String id) throws Exception { - Bucket bucket = bucketService.getById(id); - //处理格式转换 - BucketVO bucketVO = BucketConverter.INSTANT.entityToVO(bucket); - return ResultBean.success(bucketVO); - } - - /** - * 通过实体不为空的属性作为筛选条件查询对象列表 - * - * @param bucketQuery 实例对象 - * @return 对象列表 - */ - @PostMapping(value = "/list") - @Operation(summary = "查询所有") - public ResultBean> list(@RequestBody BucketQuery bucketQuery) { - //处理格式转换 - Bucket bucket = BucketConverter.INSTANT.queryToEntity(bucketQuery); - //执行分页查询 - List listResult = bucketService.list(new QueryWrapper<>(bucket)); - return ResultBean.success(BeanCopyUtils.coverList(listResult, BucketVO.class)); - } - - /** - * 新增数据 - * - * @param bucketDTO 实体对象 - * @return 新增结果 - */ - @PostMapping("/add") - @Operation(summary = "新增数据") - @LogRecord(content = "创建存储桶", businessType = BusinessType.INSERT) - @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") - public ResultBean insert(@RequestBody @Validated BucketPostDTO bucketDTO) throws Exception { - //处理格式转换 - Bucket bucket = BucketConverter.INSTANT.postDtoToEntity(bucketDTO); - //执行数据保存 - minIOService.createBucket(BeanCopyUtils.copyPropertiesThird(bucket, BucketS3.class)); - bucketService.save(bucket); - return ResultBean.success(); - } - - /** - * 修改数据 - * - * @param bucketDTO 实体对象 - * @return 修改结果 - */ - @PutMapping("/update") - @Operation(summary = "修改数据") - @LogRecord(content = "修改存储桶", businessType = BusinessType.UPDATE) - public ResultBean update(@RequestBody @Validated BucketPutDTO bucketDTO) { - //处理格式转换 - Bucket bucket = BucketConverter.INSTANT.putDtoToEntity(bucketDTO); - //执行数据更新 - return ResultBean.success(bucketService.updateById(bucket)); - } - - /** - * 删除数据 - * - * @param ids 主键结合 - * @return 删除结果 - */ - @DeleteMapping("/delete") - @Operation(summary = "删除数据") - @LogRecord(content = "删除存储桶", businessType = BusinessType.DELETE) - public ResultBean delete(@RequestParam("ids") List ids) throws Exception { - for (String id : ids) { - Bucket bucket = bucketService.getById(id); - minIOService.deleteBucket(bucket.getBucketCode()); - bucketService.removeById(id); - } - return ResultBean.success(); - } - -} - diff --git a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/FileController.java b/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/FileController.java deleted file mode 100644 index 9df7874..0000000 --- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/FileController.java +++ /dev/null @@ -1,198 +0,0 @@ -package ai.remi.sys.web.controller; - - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.xiaoymin.knife4j.annotations.ApiSort; -import ai.remi.comm.core.result.PagerBean; -import ai.remi.comm.core.result.ResultBean; -import ai.remi.comm.domain.query.PageQuery; -import ai.remi.comm.log.annotation.LogRecord; -import ai.remi.comm.log.enums.BusinessType; -import ai.remi.comm.minio.service.MinIOService; -import ai.remi.comm.util.auth.AuthInfoUtils; -import ai.remi.comm.util.bean.BeanCopyUtils; -import ai.remi.comm.util.file.FileTypeUtils; -import ai.remi.comm.util.file.FileUtils; -import ai.remi.comm.util.string.StringUtils; -import ai.remi.sys.domain.converter.FileConverter; -import ai.remi.sys.domain.entity.Bucket; -import ai.remi.sys.domain.entity.File; -import ai.remi.sys.domain.query.FileQuery; -import ai.remi.sys.domain.vo.FileVO; -import ai.remi.sys.server.service.BucketService; -import ai.remi.sys.server.service.FileService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.apache.commons.io.IOUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import javax.validation.constraints.NotBlank; -import java.io.InputStream; -import java.net.URLEncoder; -import java.util.List; - -/** - * @author DianJiu - * @email dianjiuxyz@gmail.com - * @desc 文件管理(File)控制层 - */ -@Validated -@RestController -@ApiSort(value = 1) -@Tag(name = "文件管理") -@RequestMapping("file") -public class FileController { - - @Resource - private BucketService bucketService; - - @Resource - private FileService fileService; - - @Resource - MinIOService minIOService; - - @Value("${minio.bucketName}") - private String bucketName; - - @PostMapping("/upload") - @Operation(summary = "上传文件", description = "上传文件") - @LogRecord(content = "上传一个文件", businessType = BusinessType.UPLOAD) - @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") - public ResultBean upload(@RequestParam(name = "bucketCode", required = false) String bucketCode, - @RequestParam(name = "directory", required = false) String directory, - @RequestParam(name = "multipartFile") MultipartFile multipartFile) throws Exception { - // 租户信息 - String companyTenantId = AuthInfoUtils.getCompanyTenantId(); - String deptTenantId = AuthInfoUtils.getDeptTenantId(); - // 原文件名 - String original = multipartFile.getOriginalFilename(); - // 文件类型 - String fileType = FileTypeUtils.getExtension(multipartFile); - // 文件编码 - String fileCode = String.valueOf(System.currentTimeMillis()); - // 文件目录 - directory = StringUtils.isNotBlank(directory) ? directory : companyTenantId + "/" + deptTenantId + "/"; - // 文件名称 - String fileName = fileCode + "." + fileType; - // 存储桶 - bucketCode = StringUtils.isNotBlank(bucketCode) ? bucketCode : bucketName; - // 判断Bucket是否存在 - if (minIOService.bucketExists(bucketCode)) { - // 文件上传 - minIOService.uploadFile(bucketCode, directory + fileName, - multipartFile.getInputStream()); - } - // 文件入库 - Bucket bucket = bucketService.getOne(Wrappers.lambdaQuery().eq(Bucket::getBucketCode, bucketCode).last("limit 1")); - File fileInfo = File.builder().bucketCode(bucketCode).bucketName(bucket.getBucketName()).deptTenantId(deptTenantId).companyTenantId(companyTenantId) - .fileCode(fileCode).fileType(fileType).fileSize(FileUtils.formatSize(multipartFile.getSize())).filePath(directory).fileName(fileName).original(original).status(1).build(); - fileService.save(fileInfo); - return ResultBean.success("上传成功", FileConverter.INSTANT.entityToVO(fileInfo)); - } - - @GetMapping("/download") - @Operation(summary = "下载文件", description = "下载文件") - @LogRecord(content = "下载一个文件", businessType = BusinessType.DOWNLOAD) - public void downloadFile(@RequestParam(name = "bucketCode", required = false) String bucketCode, - @RequestParam(name = "directory", required = false) String directory, - @RequestParam(value = "fileName") String fileName, HttpServletResponse response) throws Exception { - // 租户信息 - String companyTenantId = AuthInfoUtils.getCompanyTenantId(); - String deptTenantId = AuthInfoUtils.getDeptTenantId(); - // 文件目录 - directory = StringUtils.isNotBlank(directory) ? directory : companyTenantId + "/" + deptTenantId + "/"; - // 存储桶 - bucketCode = StringUtils.isNotBlank(bucketCode) ? bucketCode : bucketName; - // 下载文件 - InputStream stream = minIOService.download(bucketCode, directory + fileName); - response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Content-Disposition", - "attachment;filename=" + URLEncoder.encode(fileName.substring(fileName.lastIndexOf("/") + 1), "UTF-8")); - response.setContentType("application/octet-stream"); - response.setCharacterEncoding("UTF-8"); - IOUtils.copy(stream, response.getOutputStream()); - } - - @GetMapping("/preview") - @Operation(summary = "预览文件", description = "预览文件") - public ResultBean getPreviewFileUrl(@RequestParam(name = "bucketCode", required = false) String bucketCode, - @RequestParam(name = "directory", required = false) String directory, - @RequestParam(name = "fileName") String fileName) throws Exception { - // 租户信息 - String companyTenantId = AuthInfoUtils.getCompanyTenantId(); - String deptTenantId = AuthInfoUtils.getDeptTenantId(); - // 文件目录 - directory = StringUtils.isNotBlank(directory) ? directory : companyTenantId + "/" + deptTenantId + "/"; - // 存储桶 - bucketCode = StringUtils.isNotBlank(bucketCode) ? bucketCode : bucketName; - // 分享文件 - return ResultBean.success("预览成功！",minIOService.getPresignedObjectUrl(bucketCode, directory + fileName)); - } - - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @GetMapping("{id}") - @Operation(summary = "查询单条", description = "查询单条") - public ResultBean get(@PathVariable @Validated @NotBlank(message = "ID不能为空") String id) { - File file = fileService.getById(id); - //处理格式转换 - FileVO fileVO = FileConverter.INSTANT.entityToVO(file); - return ResultBean.success(fileVO); - } - - - /** - * 分页查询所有数据 - * - * @param pageQuery 分页对象 - * @param fileQuery 查询实体 - * @return 分页对象 - */ - @PostMapping(value = "/page") - @Operation(summary = "分页查询", description = "分页查询") - public ResultBean> page(PageQuery pageQuery, FileQuery fileQuery) { - //处理分页条件 - Page page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); - //处理格式转换 - File file = FileConverter.INSTANT.queryToEntity(fileQuery); - //执行分页查询 - Page pageResult = fileService.page(page, new QueryWrapper<>(file)); - PagerBean pageBean = new PagerBean<>(pageResult.getTotal(), pageResult.getCurrent(), - pageResult.getSize(), BeanCopyUtils.coverList(pageResult.getRecords(), FileVO.class)); - return ResultBean.success(pageBean); - } - - - /** - * 删除数据 - * - * @param ids 主键结合 - * @return 删除结果 - */ - @DeleteMapping("/delete") - @Operation(summary = "批量删除", description = "批量删除") - @Transactional(rollbackFor = Exception.class, transactionManager = "transactionManager") - public ResultBean delete(@RequestParam("ids") List ids) throws Exception { - for (String id : ids) { - File file = fileService.getById(id); - minIOService.deleteObject(file.getBucketCode(), file.getCompanyTenantId() + "/" + file.getDeptTenantId() + "/" + file.getFileName()); - fileService.removeById(id); - } - return ResultBean.success(); - } - -} - diff --git a/remi-sys/remi-sys-web/src/main/resources/docker/README.md b/remi-sys/remi-sys-web/src/main/resources/docker/README.md deleted file mode 100644 index f42efd3..0000000 --- a/remi-sys/remi-sys-web/src/main/resources/docker/README.md +++ /dev/null @@ -1,7 +0,0 @@ - -## 如果基于Docker部署项目 直接运行如下脚本即可 -```shell -sh ./docker_deploy.sh - -docker logs -f dev-remi-sys-web -``` diff --git a/remi-sys/remi-sys-web/src/main/resources/docker/docker_deploy.sh b/remi-sys/remi-sys-web/src/main/resources/docker/docker_deploy.sh deleted file mode 100644 index 93ffd93..0000000 --- a/remi-sys/remi-sys-web/src/main/resources/docker/docker_deploy.sh +++ /dev/null @@ -1,12 +0,0 @@ -#先删除原有的镜像 -docker images | grep dev-remi-sys-web | awk '{print $3}' | xargs docker rmi -f -docker build -t dev-remi-sys-web . -docker images | grep dev-remi-sys-web -#把新镜像推送到私服 -docker login -uadmin -pRemi123 harbor.******.com -docker tag dev-remi-sys-web harbor.******.com/remi-top/dev-remi-sys-web:3.1.0 -docker tag dev-remi-sys-web harbor.******.com/remi-top/dev-remi-sys-web -docker push harbor.******.com/remi-top/dev-remi-sys-web:3.1.0 -docker push harbor.******.com/remi-top/dev-remi-sys-web -#基于Docker启动容器 -docker run --restart=always -t -dit -p 1010:1010 --name dev-remi-sys-web harbor.******.com/remi-top/dev-remi-sys-web diff --git a/remi-sys/remi-sys-web/src/main/resources/k8s/docker_deploy.sh b/remi-sys/remi-sys-web/src/main/resources/k8s/docker_deploy.sh deleted file mode 100644 index 86663b4..0000000 --- a/remi-sys/remi-sys-web/src/main/resources/k8s/docker_deploy.sh +++ /dev/null @@ -1,10 +0,0 @@ -#先删除原有的镜像 -docker images | grep dev-remi-sys-web | awk '{print $3}' | xargs docker rmi -f -docker build -t dev-remi-sys-web . -docker images | grep dev-remi-sys-web -#把新镜像推送到私服 -docker login -uadmin -pRemi123 harbor.******.com -docker tag dev-remi-sys-web harbor.******.com/remi-top/dev-remi-sys-web:3.1.0 -docker tag dev-remi-sys-web harbor.******.com/remi-top/dev-remi-sys-web -docker push harbor.******.com/remi-top/dev-remi-sys-web:3.1.0 -docker push harbor.******.com/remi-top/dev-remi-sys-web diff --git a/remi-sys/remi-sys-web/src/main/resources/k8s/k8s_deploy.sh b/remi-sys/remi-sys-web/src/main/resources/k8s/k8s_deploy.sh deleted file mode 100644 index 3b3e031..0000000 --- a/remi-sys/remi-sys-web/src/main/resources/k8s/k8s_deploy.sh +++ /dev/null @@ -1,5 +0,0 @@ -#先删除原有的Pod -kubectl delete deployment dev-remi-sys-web -n remi-top --grace-period=0 --force -kubectl delete svc dev-remi-sys-web -n remi-top -#启动新的Pod -kubectl create -f dev-remi-sys-web.yaml -n remi-top \ No newline at end of file