Commit fdb61d34 authored by jichao's avatar jichao

redis配置,生成代码bug,取消登陆验证

parent 7314a2ba
...@@ -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.toLowerCase(), null); rs = (ResultSet) dbmd.getColumns(null, codeSchema.getDbName(), table.toUpperCase(), null);
dbmd.getPrimaryKeys(null, null, tables[0].toLowerCase()); dbmd.getPrimaryKeys(null, null, tables[0].toUpperCase() );
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.toLowerCase()); rs = (ResultSet) dbmd.getPrimaryKeys(null, codeSchema.getDbName(), table.toUpperCase());
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){
......
...@@ -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",
......
...@@ -11,9 +11,9 @@ server: ...@@ -11,9 +11,9 @@ server:
# org.springframework.web: DEBUG # org.springframework.web: DEBUG
druid: druid:
url: jdbc:mysql://127.0.0.1:3306/zhny?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true url: jdbc:mysql://103.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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment