Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FLIPPED-AURORA
gin-vue-admin
提交
4f6cb723
G
gin-vue-admin
项目概览
FLIPPED-AURORA
/
gin-vue-admin
大约 1 年 前同步成功
通知
337
Star
18155
Fork
5506
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gin-vue-admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4f6cb723
编写于
11月 24, 2021
作者:
Mr.奇淼(
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'pgsqlDevelop' of github.com:flipped-aurora/gin-vue-admin into pgsqlDevelop
上级
7677f219
8d026a0b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
39 addition
and
26 deletion
+39
-26
server/service/system/sys_auto_code_pgsql.go
server/service/system/sys_auto_code_pgsql.go
+36
-23
server/service/system/sys_initdb_mysql.go
server/service/system/sys_initdb_mysql.go
+1
-1
server/service/system/sys_initdb_pgsql.go
server/service/system/sys_initdb_pgsql.go
+2
-2
未找到文件。
server/service/system/sys_auto_code_pgsql.go
浏览文件 @
4f6cb723
...
...
@@ -7,6 +7,7 @@ import (
"gorm.io/driver/postgres"
"gorm.io/gorm"
"gorm.io/gorm/logger"
"strings"
)
var
AutoCodePgsql
=
new
(
autoCodePgsql
)
...
...
@@ -43,34 +44,46 @@ func (a *autoCodePgsql) GetTables(dbName string) (data []response.Table, err err
func
(
a
*
autoCodePgsql
)
GetColumn
(
tableName
string
,
dbName
string
)
(
data
[]
response
.
Column
,
err
error
)
{
// todo 数据获取不全, 待完善sql
sql
:=
`
SELECT columns.COLUMN_NAME as column_name,
columns.DATA_TYPE as data_type,
CASE
columns.DATA_TYPE
WHEN 'text' THEN
concat_ws('', '', columns.CHARACTER_MAXIMUM_LENGTH)
WHEN 'varchar' THEN
concat_ws('', '', columns.CHARACTER_MAXIMUM_LENGTH)
WHEN 'smallint' THEN
concat_ws(',', columns.NUMERIC_PRECISION, columns.NUMERIC_SCALE)
WHEN 'decimal' THEN
concat_ws(',', columns.NUMERIC_PRECISION, columns.NUMERIC_SCALE)
WHEN 'integer' THEN
concat_ws('', '', columns.NUMERIC_PRECISION)
WHEN 'bigint' THEN
concat_ws('', '', columns.NUMERIC_PRECISION)
ELSE ''
END AS data_type_long
FROM INFORMATION_SCHEMA.COLUMNS columns
WHERE table_catalog = ?
and table_schema = ?
and table_name = ?
SELECT columns.COLUMN_NAME as column_name,
columns.DATA_TYPE as data_type,
CASE
columns.DATA_TYPE
WHEN 'text' THEN
concat_ws('', '', columns.CHARACTER_MAXIMUM_LENGTH)
WHEN 'varchar' THEN
concat_ws('', '', columns.CHARACTER_MAXIMUM_LENGTH)
WHEN 'smallint' THEN
concat_ws(',', columns.NUMERIC_PRECISION, columns.NUMERIC_SCALE)
WHEN 'decimal' THEN
concat_ws(',', columns.NUMERIC_PRECISION, columns.NUMERIC_SCALE)
WHEN 'integer' THEN
concat_ws('', '', columns.NUMERIC_PRECISION)
WHEN 'bigint' THEN
concat_ws('', '', columns.NUMERIC_PRECISION)
ELSE ''
END AS data_type_long,
(select description.description
from pg_description description
where description.objoid = (select attribute.attrelid
from pg_attribute attribute
where attribute.attrelid =
(select oid from pg_class class where class.relname = '@table_name') and attname =columns.COLUMN_NAME )
and description.objsubid = (select attribute.attnum
from pg_attribute attribute
where attribute.attrelid =
(select oid from pg_class class where class.relname = '@table_name') and attname =columns.COLUMN_NAME )) as column_comment
FROM INFORMATION_SCHEMA.COLUMNS columns
WHERE table_catalog = '@table_catalog'
and table_schema = 'public'
and table_name = '@table_name';
`
var
entities
[]
response
.
Column
db
,
_err
:=
gorm
.
Open
(
postgres
.
Open
(
global
.
GVA_CONFIG
.
Pgsql
.
LinkDsn
(
dbName
)),
&
gorm
.
Config
{
Logger
:
logger
.
Default
.
LogMode
(
logger
.
Info
)})
if
_err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"[pgsql] 连接 数据库(%s)的表(%s)失败!"
,
dbName
,
tableName
)
}
err
=
db
.
Raw
(
sql
,
dbName
,
"public"
,
tableName
)
.
Scan
(
&
entities
)
.
Error
sql
=
strings
.
ReplaceAll
(
sql
,
"@table_catalog"
,
dbName
)
sql
=
strings
.
ReplaceAll
(
sql
,
"@table_name"
,
tableName
)
err
=
db
.
Raw
(
sql
)
.
Scan
(
&
entities
)
.
Error
return
entities
,
err
}
server/service/system/sys_initdb_mysql.go
浏览文件 @
4f6cb723
...
...
@@ -24,7 +24,7 @@ func (initDBService *InitDBService) writeMysqlConfig(mysql config.Mysql) error {
for
k
,
v
:=
range
cs
{
global
.
GVA_VP
.
Set
(
k
,
v
)
}
global
.
GVA_VP
.
Set
(
"jwt.signing-key"
,
uuid
.
NewV4
())
global
.
GVA_VP
.
Set
(
"jwt.signing-key"
,
uuid
.
NewV4
()
.
String
()
)
return
global
.
GVA_VP
.
WriteConfig
()
}
...
...
server/service/system/sys_initdb_pgsql.go
浏览文件 @
4f6cb723
...
...
@@ -23,7 +23,7 @@ func (initDBService *InitDBService) writePgsqlConfig(pgsql config.Pgsql) error {
for
k
,
v
:=
range
cs
{
global
.
GVA_VP
.
Set
(
k
,
v
)
}
global
.
GVA_VP
.
Set
(
"jwt.signing-key"
,
uuid
.
NewV4
())
global
.
GVA_VP
.
Set
(
"jwt.signing-key"
,
uuid
.
NewV4
()
.
String
()
)
return
global
.
GVA_VP
.
WriteConfig
()
}
...
...
@@ -69,7 +69,7 @@ func (initDBService *InitDBService) initPgsqlDB(conf request.InitDB) error {
// initPgsqlData pgsql 初始化数据
// Author [SliverHorn](https://github.com/SliverHorn)
func
(
initDBService
*
InitDBService
)
initPgsqlData
()
error
{
return
model
.
My
sqlDataInitialize
(
return
model
.
Pg
sqlDataInitialize
(
system
.
Api
,
system
.
User
,
system
.
Casbin
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录