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
test ContentNegotiatingViewResolver
  • Loading branch information
netbuffer committed Jan 18, 2017
commit 58c28abe4742d5f2b6e01752aa465b257be7a6cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public class ConfigConstant {
*/
public static final String USERTABLE="user";
public static final String ISLOGIN = "islogin";
public static final String USERNAME = "username";
public static final String USERNAME = "admin";
public static final String EXCELSTR = "xls";
public static final String PROJECTNAME = "spring-boot-bootstrap_table";
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package cn.com.ttblog.spring_boot_bootstrap_table.config;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.alibaba.fastjson.support.config.FastJsonConfig;
import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.converter.HttpMessageConverter;

@Configuration
@ConditionalOnClass({JSON.class}) //1
public class FastJsonHttpMessageConvertersConfiguration {

@Bean
public HttpMessageConverters fastJsonHttpMessageConverters() {
FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();//2

FastJsonConfig fastJsonConfig = new FastJsonConfig();
fastJsonConfig.setSerializerFeatures(
SerializerFeature.PrettyFormat,
SerializerFeature.WriteClassName
);
fastConverter.setFastJsonConfig(fastJsonConfig);

HttpMessageConverter<?> converter = fastConverter;

return new HttpMessageConverters(converter);
}
}
Original file line number Diff line number Diff line change
@@ -1,18 +1,48 @@
package cn.com.ttblog.spring_boot_bootstrap_table.config;

import cn.com.ttblog.spring_boot_bootstrap_table.views.JsonViewResolver;
import com.alibaba.fastjson.support.spring.FastJsonJsonView;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType;
import org.springframework.web.accept.ContentNegotiationManager;
import org.springframework.web.multipart.MultipartResolver;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
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.config.annotation.*;
import org.springframework.web.servlet.view.ContentNegotiatingViewResolver;
import org.springframework.web.servlet.view.InternalResourceViewResolver;
import org.springframework.web.servlet.view.JstlView;

import java.util.ArrayList;
import java.util.List;

@Configuration
@EnableWebMvc
public class MvcConfig extends WebMvcConfigurerAdapter{

@Override
public void configureContentNegotiation(
ContentNegotiationConfigurer configurer) {
configurer.ignoreAcceptHeader(false).defaultContentType(MediaType.TEXT_HTML);
}

// 在此---配置ContentNegotiatingViewResolver,通过此代理到不同的viewResolover
@Bean
public ViewResolver contentNegotiatingViewResolver(
ContentNegotiationManager manager) {
ContentNegotiatingViewResolver resolver = new ContentNegotiatingViewResolver();
resolver.setContentNegotiationManager(manager);
List<ViewResolver> resolvers = new ArrayList<ViewResolver>();
// jsp view resolver
resolvers.add(internalResourceViewResolver());
JsonViewResolver jsonViewResolver=new JsonViewResolver();
resolvers.add(jsonViewResolver);
resolver.setViewResolvers(resolvers);
return resolver;
}

@Bean
public ViewResolver internalResourceViewResolver () {
InternalResourceViewResolver viewResolver = new InternalResourceViewResolver();
Expand All @@ -22,6 +52,20 @@ public ViewResolver internalResourceViewResolver () {
return viewResolver;
}

// 注册自定义拦截器
// @Override
// public void addInterceptors(InterceptorRegistry registry) {
// registry.addInterceptor();
// }

// 文件上传设置
@Bean
public MultipartResolver multipartResolver() {
CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver();
multipartResolver.setMaxUploadSize(1000000);
return multipartResolver;
}

@Override
public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
configurer.enable();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,27 @@

import cn.com.ttblog.spring_boot_bootstrap_table.Constant.ConfigConstant;
import cn.com.ttblog.spring_boot_bootstrap_table.service.IUserService;
import com.alibaba.fastjson.JSONArray;
import org.apache.commons.codec.binary.Base64;
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.FileSystemResource;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.File;
import java.text.DecimalFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

//import com.codahale.metrics.annotation.Timed;

/**
* index
*/
@Controller(value="mainindex")
@RequestMapping("/")
public class IndexController {
Expand Down Expand Up @@ -57,7 +50,20 @@ public String welcome(Model m){
return "welcome";
}

@RequestMapping("/login")
@RequestMapping(value = "/error",method = RequestMethod.GET)
public String error(){
logger.info("error页面");
return "500";
}

//打开登录
@RequestMapping(value = "/login",method = RequestMethod.GET)
public String login(@RequestParam(value="requri",required=false) String requri) {
return "redirect:/index.html?requri="+requri;
}

//登录处理
@RequestMapping(value = "/login",method = RequestMethod.POST)
public String login(HttpSession session, HttpServletRequest request,
HttpServletResponse response, String username, String password,@RequestParam(value="requri",required=false) String requri) {
// RequestContextUtils.getWebApplicationContext(request)
Expand All @@ -77,23 +83,23 @@ public String login(HttpSession session, HttpServletRequest request,
String uri=new String(Base64.decodeBase64(requri));
String touri=uri.substring(request.getContextPath().length()+1);
logger.debug("request.getContextPath():{} decode-requri:{} touri:{}",request.getContextPath(),uri,touri);
// /sssbootstrap_table
// /sssbootstrap_table/test/form?null
return "redirect:/"+touri;
}
return "redirect:/manage.html";
} else {
return "redirect:/index.html?requri="+requri;
}
}

@RequestMapping("/demo")

//demo页面
@RequestMapping(value = "/demo",method = RequestMethod.GET)
public String demolist() {
logger.debug("demo");
return "redirect:/demolist.html";
}

@RequestMapping("/exit")
//退出系统
@RequestMapping(value = "/exit",method = RequestMethod.GET)
public String exit(HttpSession session,HttpServletRequest request,
HttpServletResponse response) {
logger.debug("用户{}退出系统",session.getAttribute(ConfigConstant.USERNAME));
Expand All @@ -105,63 +111,8 @@ public String exit(HttpSession session,HttpServletRequest request,
response.addCookie(cookie);
return "redirect:/index.html";
}

@RequestMapping("/newdata")
public String newdata(HttpSession session, Model model) {
DecimalFormat df = new DecimalFormat("0.00");
// Display the total amount of memory in the Java virtual machine.
long totalMem = Runtime.getRuntime().totalMemory() / 1024 / 1024;
System.out.println(df.format(totalMem) + " MB");
// Display the maximum amount of memory that the Java virtual machine
// will attempt to use.
long maxMem = Runtime.getRuntime().maxMemory() / 1024 / 1024;
System.out.println(df.format(maxMem) + " MB");
// Display the amount of free memory in the Java Virtual Machine.
long freeMem = Runtime.getRuntime().freeMemory() / 1024 / 1024;
System.out.println(df.format(freeMem) + " MB");
logger.info("执行前:{}", model);
int newcount = userService.getNewData();
String username = session.getAttribute(ConfigConstant.USERNAME).toString();
model.addAttribute("newcount", newcount);
model.addAttribute("username", username);
logger.info("执行后:{}", model);
return "newdata";
}

@RequestMapping("teststr")
public @ResponseBody String teststr() {
return "this is str";
}

// @Timed
@RequestMapping("/datacount")
public @ResponseBody Map<String, Object> datacount() {
logger.debug("获取datacount");
List<Map<String, Object>> counts = userService.getDataSum();
JSONArray categorys = new JSONArray();
JSONArray nums = new JSONArray();
for (Map<String, Object> m : counts) {
categorys.add(m.get("adddate")==null?"":m.get("adddate").toString());
nums.add(m.get("num").toString());
}
logger.debug("categorys:{},nums:{}", categorys, nums);
Map<String, Object> data = new HashMap<String, Object>();
data.put("c", categorys);
data.put("d", nums);
return data;
}

@RequestMapping(value = "/files/{file_name}", method = RequestMethod.GET)
// @ResponseBody
public FileSystemResource getFile(@PathVariable("file_name") String fileName,HttpServletRequest request) {
return new FileSystemResource(new File(request.getServletContext().getRealPath("export")+ File.separator+fileName+".xls"));
}

@RequestMapping("/testerror")
public String testthrowException() {
throw new RuntimeException("test error");
}

//终止服务器
@RequestMapping("/sysexit")
public String sysexit(){
//退出当前jvm,导致容器停止(tomcat关闭等)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package cn.com.ttblog.spring_boot_bootstrap_table.servlet;

import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;

@WebServlet(name = "TestServlet",urlPatterns = "/testservlet")
public class TestServlet extends HttpServlet {

protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.getWriter().write("post message");
}

protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.getWriter().write("get message");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package cn.com.ttblog.spring_boot_bootstrap_table.views;

import com.alibaba.fastjson.support.spring.FastJsonJsonView;
import org.springframework.web.servlet.View;
import org.springframework.web.servlet.ViewResolver;
import java.util.Locale;

public class JsonViewResolver implements ViewResolver {

@Override
public View resolveViewName(String viewName, Locale locale)
throws Exception {
FastJsonJsonView jsonView=new FastJsonJsonView();
return jsonView;
}

}
11 changes: 6 additions & 5 deletions src/main/resources/application-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ server:
# username: root
# password: root
# initial-size: 3
spring:
mvc:
view:
prefix: /
suffix: .jspaa
# 测试发现在Config文件中配置jsp的路径才有效,这里配置不生效
#spring:
# mvc:
# view:
# prefix: /
# suffix: .jspaa
# prefix: /templates/
# suffix: .html
18 changes: 18 additions & 0 deletions src/main/webapp/404.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!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>404</title>
<link rel="icon" href="favicon.ico">
<link
href="http://cdn.bootcss.com/bootstrap/3.3.1/css/bootstrap.min.css"
rel="stylesheet">
</head>
<body>
<div class="container">
<h1>^_^--------页面未找到...</h1>
</div>
</body>
</html>
36 changes: 36 additions & 0 deletions src/main/webapp/500.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<%@ page language="java" isErrorPage="true" errorPage="500.jsp"
contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%-- <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> --%>
<!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>500</title>
<link rel="icon" href="favicon.ico">
<link
href="http://cdn.bootcss.com/bootstrap/3.3.1/css/bootstrap.min.css"
rel="stylesheet">
</head>
<body>
<!--JSP的内置(隐含)对象及EL表达式的内置(隐含)对象 http://blog.chinaunix.net/uid-725717-id-2060317.html -->
<div class="container">
发生错误啦:
<c:if test="${not empty result}">
<h1>校验信息错误</h1>
<hr/>
<h3>错误数量:${result.errorCount}</h3>
<h3>错误对象名:${result.objectName}</h3>
<c:forEach items="${result.allErrors}" var="error">
${error.code }/${error.defaultMessage }<br/>
</c:forEach>
</c:if>
<c:if test="${not empty errMsg}">
<hr/>错误信息:${errMsg }
</c:if>
${exception}
</div>
</body>
</html>
Loading