Skip to content

Bump mysql-connector-java from 5.1.38 to 8.0.28 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 66 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
d4f0fc0
update
javacoded Jan 12, 2017
a1d7e9c
update
javacoded Jan 12, 2017
0985b68
update
netbuffer Jan 12, 2017
461a0b6
update
netbuffer Jan 12, 2017
c0c42c0
add druid
javacoded Jan 17, 2017
842ee4f
add jsp
javacoded Jan 18, 2017
58c28ab
test ContentNegotiatingViewResolver
netbuffer Jan 18, 2017
278f680
update
netbuffer Jan 19, 2017
544c0ab
update
netbuffer Jan 20, 2017
501de59
error view/interceptor
netbuffer Jan 25, 2017
d678e77
filter / interceptor
netbuffer Jan 26, 2017
2eb00d8
test Log4jdbc Log4j2 Jdbc4
netbuffer Jan 27, 2017
36567b5
update readme
netbuffer Jun 4, 2017
8684ff2
update readme
netbuffer Aug 26, 2017
8167353
update LoginFilter
netbuffer Oct 27, 2017
f013f47
update login twice
netbuffer Oct 27, 2017
6e61561
rename package
netbuffer Oct 27, 2017
811e254
update
netbuffer Feb 4, 2018
316e72e
add spring-boot-devtools
netbuffer Feb 7, 2018
c7f3c89
rename
netbuffer Feb 8, 2018
5d51c26
update static files
netbuffer Feb 10, 2018
18a085e
cookie&redirect
netbuffer Mar 12, 2018
65acd63
add cookie.html
netbuffer Mar 14, 2018
a360e3d
enable spring-boot-devtools
netbuffer Mar 14, 2018
2b527cc
use druid-spring-boot-starter
netbuffer Mar 19, 2018
8f776d7
add font
netbuffer Mar 19, 2018
9301310
spring boot banner config
netbuffer Mar 19, 2018
ef063d1
enable management
netbuffer Mar 19, 2018
23e597d
update
netbuffer Mar 20, 2018
318cde3
update
netbuffer Mar 20, 2018
7c518f3
update git address
netbuffer Apr 3, 2018
c549d32
add logback status
netbuffer May 10, 2018
5559456
update
netbuffer May 11, 2018
b6e06b0
test getContextPath
netbuffer May 26, 2018
782d2ff
static inject
netbuffer May 26, 2018
3fd1d6c
rename
netbuffer Jun 7, 2018
9fa8e9a
xml output
netbuffer Jul 18, 2018
271bdc2
use @ImportResource
netbuffer Jul 18, 2018
6856ecf
update
netbuffer Jul 19, 2018
e2aa31c
use HibernateInterceptor
netbuffer Jul 19, 2018
4ed3ba9
update
netbuffer Aug 10, 2018
22eb677
update print-server-address to 1.1.1
netbuffer Sep 20, 2018
b7a4fc1
test springfox-swagger2
netbuffer Dec 19, 2018
0b05c7a
Merge remote-tracking branch 'origin/develop'
netbuffer Dec 19, 2018
654a332
update
netbuffer Mar 8, 2019
d5098cf
rename package
netbuffer Mar 8, 2019
9d8295d
test dao
netbuffer Mar 9, 2019
edc2a65
Merge remote-tracking branch 'origin/develop'
netbuffer Mar 9, 2019
0d96fdc
update
netbuffer Mar 14, 2020
9398066
adapt spring-boot2.x
netbuffer Mar 14, 2020
3c27388
Merge remote-tracking branch 'origin/develop'
netbuffer Mar 15, 2020
3d4042e
move
netbuffer Mar 17, 2020
eb20e6e
update log
netbuffer Mar 17, 2020
83e92ce
test c:out escapeXml
netbuffer Mar 17, 2020
31fec0c
Merge remote-tracking branch 'origin/develop'
netbuffer Mar 18, 2020
3d90d4f
use logback MDCInsertingServletFilter
netbuffer Mar 19, 2020
9589c37
update
netbuffer Apr 19, 2020
74d8cec
test simple validation
netbuffer May 21, 2020
9a64343
update validation
netbuffer May 22, 2020
5180ded
update validation
netbuffer May 24, 2020
27f18d6
Merge remote-tracking branch 'origin/develop'
netbuffer May 24, 2020
85b5928
update readme
netbuffer May 24, 2020
8ac8ffe
update readme
netbuffer May 24, 2020
a77f7f5
Merge remote-tracking branch 'origin/develop'
netbuffer May 24, 2020
f96ab12
update readme
netbuffer May 24, 2020
b6eebc2
Bump mysql-connector-java from 5.1.38 to 8.0.28
dependabot[bot] Jun 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add jsp
  • Loading branch information
javacoded committed Jan 18, 2017
commit 842ee4f764c8af34efc34e62fdf9fc7972bba59b
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
### spring-boot bootstrap_table demo
### spring-boot bootstrap_table demo
---
* spring-boot 1.4.3
* integration with jsp
34 changes: 32 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
<groupId>cn.com.ttblog</groupId>
<artifactId>spring-boot-bootstrap_table</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<!--
部署war包到tomcat,可执行jar包可以使用嵌入的tomcat、jetty等servlet容器来运行
注意的是如果打war包,需要将spring-boot-starter-tomcat等tomcat的jar依赖排除
-->
<packaging>war</packaging>

<name>spring-boot-bootstrap_table</name>
<description>Demo project for Spring Boot</description>
Expand Down Expand Up @@ -48,9 +52,19 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<!--<dependency>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-starter-thymeleaf</artifactId>-->
<!--</dependency>-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<!--<scope>provided</scope>-->
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<!--<scope>provided</scope>-->
</dependency>

<dependency>
Expand All @@ -59,10 +73,25 @@
<version>5.1.38</version>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.2.1-b03</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.alibaba</groupId>
Expand Down Expand Up @@ -108,6 +137,7 @@
</dependencies>

<build>
<finalName>spring-boot-bootstrap_table</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,19 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;

@SpringBootApplication
public class SpringBootBootstrapTableApplication {
public class SpringBootBootstrapTableApplication extends SpringBootServletInitializer {

@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(SpringBootBootstrapTableApplication.class);
}

public static void main(String[] args) {
SpringApplication.run(SpringBootBootstrapTableApplication.class, args);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package cn.com.ttblog.spring_boot_bootstrap_table.config;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.ViewResolver;
import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.view.InternalResourceViewResolver;
import org.springframework.web.servlet.view.JstlView;

@Configuration
@EnableWebMvc
public class MvcConfig extends WebMvcConfigurerAdapter{

@Bean
public ViewResolver internalResourceViewResolver () {
InternalResourceViewResolver viewResolver = new InternalResourceViewResolver();
viewResolver.setPrefix("/");
viewResolver.setSuffix(".jsp");
viewResolver.setViewClass(JstlView.class);
return viewResolver;
}

@Override
public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
configurer.enable();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,13 @@ public IndexController(){
@RequestMapping(method = RequestMethod.GET)
public String index(){
logger.info("index页面");
return "index";
return "redirect:index.html";
}

@RequestMapping(value = "/welcome",method = RequestMethod.GET)
public String welcome(){
public String welcome(Model m){
logger.info("welcome页面");
m.addAttribute("user","world");
return "welcome";
}

Expand Down

This file was deleted.

This file was deleted.

5 changes: 3 additions & 2 deletions src/main/resources/application-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ server:
# username: root
# password: root
# initial-size: 3
spring:
mvc:
view:
suffix: .jsp
prefix: /WEB-INF/jsp/
prefix: /
suffix: .jspaa
# prefix: /templates/
# suffix: .html
7 changes: 3 additions & 4 deletions src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ spring:
logging:
# loback配置文件命名为logback.xml会导致启动不起来
config: classpath:logback-springboot.xml
endpoints:
shutdown:
enabled: true

# 环境变量
---
spring:
profiles: dev
mvc:
static-path-pattern: /**
resources:
static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/
server:
context-path: /dev
---
Expand Down
10 changes: 5 additions & 5 deletions src/main/resources/logback-springboot.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<property name="logname" value="ssmbootstrap_table" />
<property name="logbase" value="${catalina.base}/logs/ssmbootstrap_table/" />
<property name="logname" value="spring-boot-bootstrap_table" />
<property name="logbase" value="${catalina.base}/logs/spring-boot-bootstrap_table/" />
<jmxConfigurator />
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
<encoder charset="utf-8">
Expand Down Expand Up @@ -54,13 +54,13 @@
<logger name="org.springframework" level="DEBUG" />
<logger name="org.hibernate" level="OFF" />
<logger name="org.apache" level="INFO" />
<logger name="cn.com.ttblog.ssmbootstrap_table" level="INFO" />
<logger name="cn.com.ttblog.spring_boot_bootstrap_table" level="INFO" />
</springProfile>

<springProfile name="test">
<logger name="org.springframework" level="DEBUG" />
<logger name="java.sql" level="OFF" />
<logger name="cn.com.ttblog.ssmbootstrap_table" level="INFO" />
<logger name="cn.com.ttblog.spring_boot_bootstrap_table" level="INFO" />
<logger name="jdbc.resultsettable" level="INFO" />
<logger name="jdbc.connection" level="OFF" />
<logger name="jdbc.audit" level="OFF" />
Expand All @@ -74,7 +74,7 @@
<springProfile name="product">
<logger name="org.springframework" level="WARN" />
<logger name="java.sql" level="OFF" />
<logger name="cn.com.ttblog.ssmbootstrap_table" level="INFO" />
<logger name="cn.com.ttblog.spring_boot_bootstrap_table" level="INFO" />
<logger name="jdbc.resultsettable" level="OFF" />
<logger name="jdbc.connection" level="OFF" />
<logger name="jdbc.audit" level="OFF" />
Expand Down
121 changes: 121 additions & 0 deletions src/main/webapp/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
<!DOCTYPE html>
<html lang="zh-cn">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
<title>登陆系统</title>
<link rel="icon" href="favicon.ico">
<link
href="http://cdn.bootcss.com/bootstrap/3.3.1/css/bootstrap.min.css"
rel="stylesheet">
<link href="//cdn.bootcss.com/jQuery-Validation-Engine/2.6.4/validationEngine.jquery.min.css" rel="stylesheet">
<link href="css/css.css" rel="stylesheet">
<link href="css/font-awesome.css" rel="stylesheet">
<link href="css/form-elements.css" rel="stylesheet">
<link href="css/style.css" rel="stylesheet">
<script src="http://cdn.bootcss.com/jquery/2.1.3/jquery.js"></script>
<script src="//cdn.bootcss.com/jquery-url-parser/2.3.1/purl.min.js"></script>
<script src="//cdn.bootcss.com/jquery-backstretch/2.0.4/jquery.backstretch.min.js"></script>
<script src="//cdn.bootcss.com/jQuery-Validation-Engine/2.6.4/languages/jquery.validationEngine-zh_CN.min.js"></script>
<script src="//cdn.bootcss.com/jQuery-Validation-Engine/2.6.4/jquery.validationEngine.min.js"></script>
<script type="text/javascript">
$(function(){
if($("#form-username").val()==""){
$("#form-username").focus();
}
$(document).keydown(function(event){
if(event.keyCode==13){
$("#login_form").submit();
}
});
$.backstretch("image/backimg.jpg");
$("input[name='requri']").val($.url(window.location.href).param('requri'));
$("#login_form").validationEngine('attach', {
showOneMessage: false,
"custom_error_messages": {
"#username": {
'required': {
'message': "请填写用户名"
},
'custom[email]': {
'message': "邮件格式错误"
}
}
},
promptPosition: "top",
scroll: false,
onValidationComplete: function(form, status) {
//可以通过这里阻止表单提交
console.log("The form status is: " + status + ", it will never submit");
return status;
}
});
});
</script>
</head>
<body>
<div class="container">
<div class="top-content">
<div class="inner-bg">
<div class="container">
<div class="row">
<div class="col-sm-8 col-sm-offset-2 text">
<h1>
<strong>欢迎使用</strong>
</h1>
<div class="description">
<p>
This is a free responsive login form made with Bootstrap.
Download it on <a href="http://azmind.com/"><strong>AZMIND</strong></a>,
customize and use it as you like!
</p>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6 col-sm-offset-3 form-box">
<div class="form-top">
<div class="form-top-left">
<h3>登陆</h3>
<p>Enter your username and password to log on:</p>
</div>
<div class="form-top-right"></div>
</div>
<div class="form-bottom">
<form role="form" action="login" method="post"
class="login-form" id="login_form">
<div class="form-group">
<label class="sr-only" for="form-username">用户名</label> <input
name="username" placeholder="Username..."
class="validate[required] form-username form-control input-error"
id="form-username" type="text">
</div>
<div class="form-group">
<label class="sr-only" for="form-password">密码</label> <input
name="password" placeholder="Password..."
class="validate[required] form-password form-control input-error"
id="form-password" type="password">
</div>
<input name="requri" type="hidden" value=""/>
<button type="submit" class="btn">登陆</button>
</form>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6 col-sm-offset-3 social-login">
<h3>...or login with:</h3>
<div class="social-login-buttons">
<a class="btn btn-link-2" href="#"> Facebook </a> <a
class="btn btn-link-2" href="#"> Twitter </a> <a
class="btn btn-link-2" href="#"> Google Plus </a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
File renamed without changes.
Loading