Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zhny
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王夏晖
zhny
Commits
fdb61d34
Commit
fdb61d34
authored
Apr 12, 2018
by
jichao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
redis配置,生成代码bug,取消登陆验证
parent
7314a2ba
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
5 deletions
+17
-5
CodeServiceImpl.java
...n/java/org/rcisoft/code/service/impl/CodeServiceImpl.java
+3
-3
SecurityConfig.java
src/main/java/org/rcisoft/config/SecurityConfig.java
+1
-0
application-dev.yml
src/main/resources/application-dev.yml
+13
-2
No files found.
src/main/java/org/rcisoft/code/service/impl/CodeServiceImpl.java
View file @
fdb61d34
...
@@ -100,8 +100,8 @@ public class CodeServiceImpl extends BaseService implements CodeService {
...
@@ -100,8 +100,8 @@ public class CodeServiceImpl extends BaseService implements CodeService {
tableModel
.
setTableName
(
table
.
toLowerCase
());
tableModel
.
setTableName
(
table
.
toLowerCase
());
tableModel
.
setTableRemark
(
tableRemarks
.
get
(
table
).
toString
());
tableModel
.
setTableRemark
(
tableRemarks
.
get
(
table
).
toString
());
//column
//column
rs
=
(
ResultSet
)
dbmd
.
getColumns
(
null
,
codeSchema
.
getDbName
(),
table
.
to
Low
erCase
(),
null
);
rs
=
(
ResultSet
)
dbmd
.
getColumns
(
null
,
codeSchema
.
getDbName
(),
table
.
to
Upp
erCase
(),
null
);
dbmd
.
getPrimaryKeys
(
null
,
null
,
tables
[
0
].
to
LowerCase
()
);
dbmd
.
getPrimaryKeys
(
null
,
null
,
tables
[
0
].
to
UpperCase
()
);
boolean
flag
=
false
;
boolean
flag
=
false
;
while
(
rs
.
next
())
{
while
(
rs
.
next
())
{
model
=
new
DbColumnModel
();
model
=
new
DbColumnModel
();
...
@@ -111,7 +111,7 @@ public class CodeServiceImpl extends BaseService implements CodeService {
...
@@ -111,7 +111,7 @@ public class CodeServiceImpl extends BaseService implements CodeService {
model
.
copyColumnFromSqlResult
(
rs
);
model
.
copyColumnFromSqlResult
(
rs
);
models
.
add
(
model
);
models
.
add
(
model
);
}
}
rs
=
(
ResultSet
)
dbmd
.
getPrimaryKeys
(
null
,
codeSchema
.
getDbName
(),
table
.
to
Low
erCase
());
rs
=
(
ResultSet
)
dbmd
.
getPrimaryKeys
(
null
,
codeSchema
.
getDbName
(),
table
.
to
Upp
erCase
());
while
(
rs
.
next
())
{
while
(
rs
.
next
())
{
String
column
=
rs
.
getString
(
"COLUMN_NAME"
);
String
column
=
rs
.
getString
(
"COLUMN_NAME"
);
for
(
DbColumnModel
cm
:
models
){
for
(
DbColumnModel
cm
:
models
){
...
...
src/main/java/org/rcisoft/config/SecurityConfig.java
View file @
fdb61d34
...
@@ -80,6 +80,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
...
@@ -80,6 +80,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
.
antMatchers
(
"/auth/**"
).
permitAll
()
//登录注册等请求过滤
.
antMatchers
(
"/auth/**"
).
permitAll
()
//登录注册等请求过滤
.
antMatchers
(
"/code/**"
).
permitAll
()
//登录注册等请求过滤
.
antMatchers
(
"/code/**"
).
permitAll
()
//登录注册等请求过滤
.
antMatchers
(
"/excelUtil/**"
).
permitAll
()
//excel类
.
antMatchers
(
"/excelUtil/**"
).
permitAll
()
//excel类
.
antMatchers
(
"/**/**"
).
permitAll
()
.
antMatchers
(
.
antMatchers
(
"/"
,
"/"
,
"/*.html"
,
"/*.html"
,
...
...
src/main/resources/application-dev.yml
View file @
fdb61d34
...
@@ -11,9 +11,9 @@ server:
...
@@ -11,9 +11,9 @@ server:
# org.springframework.web: DEBUG
# org.springframework.web: DEBUG
druid
:
druid
:
url
:
jdbc:mysql://1
27.0.0.1:3306
/zhny?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
url
:
jdbc:mysql://1
03.249.252.109:13328
/zhny?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
username
:
root
username
:
root
password
:
root
password
:
123456
initial-size
:
1
initial-size
:
1
min-idle
:
1
min-idle
:
1
max-active
:
20
max-active
:
20
...
@@ -56,6 +56,17 @@ spring:
...
@@ -56,6 +56,17 @@ spring:
charset
:
UTF-8
charset
:
UTF-8
suffix
:
.ftl
suffix
:
.ftl
template-loader-path
:
classpath:/templates/
template-loader-path
:
classpath:/templates/
redis
:
host
:
103.249.252.109
port
:
7484
pool
:
max-idle
:
50
max-active
:
1000
min-idle
:
5
max-wait
:
-1
database
:
0
password
:
'
'
timeout
:
3600
springfox
:
springfox
:
documentation
:
documentation
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment