p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

!959 ✨Oracle数据库DDL更新适配 

Merge pull request !959 from dhb52/feature/db
This commit is contained in:
芋道源码 2024-04-30 22:29:06 +00:00 committed by Gitee
parent 56de8b0135 06dacb747b
commit 97fa3cbb80
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 5905 additions and 6141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sql/docker-compose.yaml → sql/docker/docker-compose.yaml
View File

@ -38,8 +38,8 @@ services:
volumes:
- postgres:/var/lib/postgresql/data
# 注入初始化脚本
- ./postgresql/quartz.sql:/docker-entrypoint-initdb.d/quartz.sql:ro
- ./postgresql/ruoyi-vue-pro.sql:/docker-entrypoint-initdb.d/ruoyi-vue-pro.sql:ro
- ../postgresql/quartz.sql:/docker-entrypoint-initdb.d/quartz.sql:ro
- ../postgresql/ruoyi-vue-pro.sql:/docker-entrypoint-initdb.d/ruoyi-vue-pro.sql:ro
oracle:
image: gvenzl/oracle-xe:18-slim-faststart
@ -49,10 +49,10 @@ services:
ports:
- "1521:1521"
volumes:
- ./oracle/ruoyi-vue-pro.sql:/tmp/schema.sql:ro
- ../oracle/ruoyi-vue-pro.sql:/tmp/schema.sql:ro
# 创建app用户: ROOT/123456@//localhost/XEPDB1
- ./_docker/oracle/1_create_user.sql:/docker-entrypoint-initdb.d/1_create_user.sql:ro
- ./_docker/oracle/2_create_schema.sh:/docker-entrypoint-initdb.d/2_create_schema.sh:ro
- ./oracle/1_create_user.sql:/docker-entrypoint-initdb.d/1_create_user.sql:ro
- ./oracle/2_create_schema.sh:/docker-entrypoint-initdb.d/2_create_schema.sh:ro
sqlserver:
image: mcr.microsoft.com/mssql/server:2017-latest
@ -65,6 +65,6 @@ services:
- "1433:1433"
volumes:
- sqlserver:/var/opt/mssql
- ./sqlserver/ruoyi-vue-pro.sql:/tmp/schema.sql:ro
- ../sqlserver/ruoyi-vue-pro.sql:/tmp/schema.sql:ro
# docker compose exec sqlserver bash /tmp/create_schema.sh
- ./_docker/sqlserver/create_schema.sh:/tmp/create_schema.sh:ro
- ./sqlserver/create_schema.sh:/tmp/create_schema.sh:ro

2
sql/_docker/oracle/1_create_user.sql → sql/docker/oracle/1_create_user.sql
View File

@ -1,5 +1,3 @@
ALTER SESSION SET CONTAINER=XEPDB1;
CREATE USER ROOT IDENTIFIED BY 123456 QUOTA UNLIMITED ON USERS;
GRANT CONNECT, RESOURCE TO ROOT;

0
sql/_docker/oracle/2_create_schema.sh → sql/docker/oracle/2_create_schema.sh
View File

0
sql/_docker/sqlserver/create_schema.sh → sql/docker/sqlserver/create_schema.sh
View File

12017
sql/oracle/ruoyi-vue-pro.sql
View File

File diff suppressed because it is too large Load Diff

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java
View File

@ -20,7 +20,7 @@ import java.util.Set;
* @author 芋道源码
*/
@TableName(value = "system_users", autoResultMap = true) // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users
@KeySequence("system_user_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@KeySequence("system_users_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@Builder

11
yudao-server/src/main/resources/application-local.yaml
View File

@ -46,10 +46,10 @@ spring:
primary: master
datasource:
master:
# url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
# url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true # PostgreSQL 连接的示例
# url: jdbc:oracle:thin:@127.0.0.1:1521:XEPDB1 # Oracle 连接的示例
# url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true # PostgreSQL 连接的示例
# url: jdbc:oracle:thin:@//127.0.0.1:1521/XEPDB1 # Oracle 连接的示例
# url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ruoyi-vue-pro # SQLServer 连接的示例
# url: jdbc:dm://10.211.55.4:5236?schema=RUOYI_VUE_PRO # DM 连接的示例
username: root
@ -62,9 +62,10 @@ spring:
lazy: true # 开启懒加载，保证启动速度
# url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
# url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
# url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例
# url: jdbc:oracle:thin:@127.0.0.1:1521:XEPDB1 # Oracle 连接的示例
# url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true # PostgreSQL 连接的示例
# url: jdbc:oracle:thin:@//127.0.0.1:1521/XEPDB1 # Oracle 连接的示例
# url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ruoyi-vue-pro # SQLServer 连接的示例
# url: jdbc:dm://10.211.55.4:5236?schema=RUOYI_VUE_PRO # DM 连接的示例
username: root
password: 123456
# username: sa # SQLServer 连接的示例