diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..249d5b2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,72 @@ +# Created by .ignore support plugin (hsz.mobi) +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff: +.idea +.idea/**/tasks.xml +.idea/dictionaries + +# Sensitive or high-churn files: +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.xml +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +# Gradle: +.idea/**/gradle.xml +# CMake +cmake-build-debug/ + +# Mongo Explorer plugin: +.idea/**/mongoSettings.xml + +## File-based project format: +*.iws + +## Plugin-specific files: + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties +### Java template +# Compiled class file +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# custom +*.iml + +**/target diff --git a/Dubbo-Demo/Service-Client/pom.xml b/Dubbo-Demo/Service-Client/pom.xml new file mode 100644 index 0000000..bac9551 --- /dev/null +++ b/Dubbo-Demo/Service-Client/pom.xml @@ -0,0 +1,14 @@ + + + + cn.mrdear.dubbo + Dubbo-Demo + 1.0.0 + + 4.0.0 + Service-Client + + + \ No newline at end of file diff --git a/Dubbo-Demo/Service-Client/src/main/java/cn/mrdear/client/dto/UserDTO.java b/Dubbo-Demo/Service-Client/src/main/java/cn/mrdear/client/dto/UserDTO.java new file mode 100644 index 0000000..72dd1ce --- /dev/null +++ b/Dubbo-Demo/Service-Client/src/main/java/cn/mrdear/client/dto/UserDTO.java @@ -0,0 +1,31 @@ +package cn.mrdear.client.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 用户DTO,用于Service层传输 + * @author Niu Li + * @since 2017/6/12 + */ +@Data +public class UserDTO implements Serializable{ + + private static final long serialVersionUID = 4086492518942464226L; + + private Long id; + + private String username; + + private String password; + + private Integer age; + + private String nickname; + + private String mail; + + private String memo; + +} diff --git a/Dubbo-Demo/Service-Client/src/main/java/cn/mrdear/client/service/IUserService.java b/Dubbo-Demo/Service-Client/src/main/java/cn/mrdear/client/service/IUserService.java new file mode 100644 index 0000000..1edd92f --- /dev/null +++ b/Dubbo-Demo/Service-Client/src/main/java/cn/mrdear/client/service/IUserService.java @@ -0,0 +1,37 @@ +package cn.mrdear.client.service; + +import cn.mrdear.client.dto.UserDTO; + +import java.util.Collection; +import java.util.List; + +/** + * 用户服务,一般都会在返回层再包裹一层,这里简而化之 + * @author Niu Li + * @since 2017/6/12 + */ +public interface IUserService { + + /** + * 根据id查找 + */ + UserDTO findById(Long id); + + /** + * 根据id批量查询 + */ + List queryByIds(Collection ids); + + /** + * 更新用户 + * @return 返回更新后的实体 + */ + UserDTO updateById(UserDTO userDTO); + + /** + * 根据id删除用户 + */ + Boolean deleteById(Long id); + + +} diff --git a/Dubbo-Demo/Service-Consumer/pom.xml b/Dubbo-Demo/Service-Consumer/pom.xml new file mode 100644 index 0000000..c8ba829 --- /dev/null +++ b/Dubbo-Demo/Service-Consumer/pom.xml @@ -0,0 +1,99 @@ + + + + cn.mrdear.dubbo + Dubbo-Demo + 1.0.0 + + war + 4.0.0 + Service-Consumer + + + + + cn.mrdear.dubbo + Service-Client + 1.0.0 + + + + com.netflix.hystrix + hystrix-javanica + 1.5.12 + + + + com.fasterxml.jackson.core + jackson-annotations + 2.8.1 + + + com.fasterxml.jackson.core + jackson-core + 2.8.6 + + + com.fasterxml.jackson.core + jackson-databind + 2.8.6 + + + + org.springframework + spring-context + 4.3.2.RELEASE + + + org.springframework + spring-webmvc + 4.3.2.RELEASE + + + + javax.servlet + jstl + 1.2 + runtime + + + org.springframework + spring-web + 4.3.2.RELEASE + + + org.springframework + spring-test + 4.3.2.RELEASE + + + + com.alibaba + dubbo + 2.5.3 + + + spring + org.springframework + + + + + com.101tec + zkclient + 0.10 + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + \ No newline at end of file diff --git a/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/controller/UserController.java b/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/controller/UserController.java new file mode 100644 index 0000000..9593c2d --- /dev/null +++ b/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/controller/UserController.java @@ -0,0 +1,27 @@ +package cn.mrdear.consumer.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +import cn.mrdear.client.dto.UserDTO; +import cn.mrdear.consumer.manager.UserManager; + +import javax.annotation.Resource; + +/** + * @author Niu Li + * @since 2017/6/14 + */ +@RestController +public class UserController { + + @Resource + private UserManager userManager; + + @GetMapping("/user/{id}") + public UserDTO getUserById(@PathVariable Long id) { + UserDTO userDTO = userManager.findById(id); + return userDTO; + } +} diff --git a/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/manager/UserManager.java b/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/manager/UserManager.java new file mode 100644 index 0000000..900368e --- /dev/null +++ b/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/manager/UserManager.java @@ -0,0 +1,17 @@ +package cn.mrdear.consumer.manager; + +import cn.mrdear.client.dto.UserDTO; + +/** + * manager + * @author Niu Li + * @since 2017/6/13 + */ + +public interface UserManager { + + UserDTO findById(Long id); + + UserDTO findByIdBack(Long id); + +} diff --git a/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/manager/impl/UserManagerImpl.java b/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/manager/impl/UserManagerImpl.java new file mode 100644 index 0000000..572c407 --- /dev/null +++ b/Dubbo-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/manager/impl/UserManagerImpl.java @@ -0,0 +1,51 @@ +package cn.mrdear.consumer.manager.impl; + +import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand; + +import org.springframework.stereotype.Service; + +import cn.mrdear.client.dto.UserDTO; +import cn.mrdear.client.service.IUserService; +import cn.mrdear.consumer.manager.UserManager; + +import javax.annotation.Resource; + +import java.util.Objects; + +/** + * manager调用远程RPC组装数据,此处调试只是再加一层封装 + * @author Niu Li + * @since 2017/6/13 + */ +@Service +public class UserManagerImpl implements UserManager { + + @Resource + private IUserService userService; + + @Override + @HystrixCommand(groupKey = "user", fallbackMethod = "findByIdBack") + public UserDTO findById(Long id) { + if (Objects.equals(id, 1L)) { + try { + Thread.sleep(1000000); + } catch (InterruptedException e) { + // do nothing + } + } + if (Objects.equals(id, 2L)) { + throw new RuntimeException("熔断测试"); + } + return userService.findById(id); + } + + public UserDTO findByIdBack(Long id) { + System.err.println("findByIdBack"); + UserDTO userDTO = new UserDTO(); + userDTO.setAge(1); + userDTO.setUsername("备用用户"); + return userDTO; + } + + +} diff --git a/Dubbo-Demo/Service-Consumer/src/main/resources/applicationContext.xml b/Dubbo-Demo/Service-Consumer/src/main/resources/applicationContext.xml new file mode 100644 index 0000000..4ddd015 --- /dev/null +++ b/Dubbo-Demo/Service-Consumer/src/main/resources/applicationContext.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Dubbo-Demo/Service-Consumer/src/main/resources/dispatcher-servlet.xml b/Dubbo-Demo/Service-Consumer/src/main/resources/dispatcher-servlet.xml new file mode 100644 index 0000000..9b9a484 --- /dev/null +++ b/Dubbo-Demo/Service-Consumer/src/main/resources/dispatcher-servlet.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Dubbo-Demo/Service-Consumer/src/main/webapp/WEB-INF/view/error.jsp b/Dubbo-Demo/Service-Consumer/src/main/webapp/WEB-INF/view/error.jsp new file mode 100644 index 0000000..e9ea535 --- /dev/null +++ b/Dubbo-Demo/Service-Consumer/src/main/webapp/WEB-INF/view/error.jsp @@ -0,0 +1,16 @@ +<%-- + Created by IntelliJ IDEA. + User: niuli + Date: 2017/4/19 + Time: 09:45 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + Title + + +

Error 页面

+ + diff --git a/Dubbo-Demo/Service-Consumer/src/main/webapp/WEB-INF/web.xml b/Dubbo-Demo/Service-Consumer/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..f1339a6 --- /dev/null +++ b/Dubbo-Demo/Service-Consumer/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,65 @@ + + + + + + webAppRootKey + web.root + + + contextConfigLocation + classpath:applicationContext.xml + + + + + + encodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + + forceEncoding + true + + + + encodingFilter + /* + + + + org.springframework.web.util.WebAppRootListener + + + org.springframework.web.context.ContextLoaderListener + + + + org.springframework.web.util.IntrospectorCleanupListener + + + + + + dispatcher + org.springframework.web.servlet.DispatcherServlet + + contextConfigLocation + + classpath:dispatcher-servlet.xml + + 1 + + + dispatcher + / + + + diff --git a/Dubbo-Demo/Service-Consumer/src/main/webapp/index.jsp b/Dubbo-Demo/Service-Consumer/src/main/webapp/index.jsp new file mode 100644 index 0000000..fa47f72 --- /dev/null +++ b/Dubbo-Demo/Service-Consumer/src/main/webapp/index.jsp @@ -0,0 +1,17 @@ +<%-- + Created by IntelliJ IDEA. + User: NL + Date: 2017/1/23 + Time: 9:09 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + + + +

Hello World!

请访问/user/{id}测试

+ + diff --git a/Dubbo-Demo/Service-Consumer/src/test/java/cn/mrdear/test/UserManagerTest.java b/Dubbo-Demo/Service-Consumer/src/test/java/cn/mrdear/test/UserManagerTest.java new file mode 100644 index 0000000..bfe506b --- /dev/null +++ b/Dubbo-Demo/Service-Consumer/src/test/java/cn/mrdear/test/UserManagerTest.java @@ -0,0 +1,31 @@ +package cn.mrdear.test; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import cn.mrdear.client.dto.UserDTO; +import cn.mrdear.consumer.manager.UserManager; + +import javax.annotation.Resource; + +/** + * @author Niu Li + * @since 2017/6/13 + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations = "classpath:applicationContext.xml") +public class UserManagerTest { + + @Resource + private UserManager userManager; + + + @Test + public void testFindById() { + UserDTO userDTO = userManager.findById(1L); + Assert.assertNotNull(userDTO); + } +} diff --git a/Dubbo-Demo/Service-Consumer/src/test/resources/applicationContext.xml b/Dubbo-Demo/Service-Consumer/src/test/resources/applicationContext.xml new file mode 100644 index 0000000..5a693f6 --- /dev/null +++ b/Dubbo-Demo/Service-Consumer/src/test/resources/applicationContext.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Dubbo-Demo/Service-Provider/pom.xml b/Dubbo-Demo/Service-Provider/pom.xml new file mode 100644 index 0000000..97f5cb5 --- /dev/null +++ b/Dubbo-Demo/Service-Provider/pom.xml @@ -0,0 +1,120 @@ + + + + cn.mrdear.dubbo + Dubbo-Demo + 1.0.0 + + 4.0.0 + Service-Provider + + + + + cn.mrdear.dubbo + Service-Client + 1.0.0 + + + com.alibaba + dubbo + 2.5.3 + + + org.springframework + spring + + + org.javassist + javassist + + + + + com.101tec + zkclient + 0.10 + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + com.h2database + h2 + 1.4.187 + + + org.springframework + spring-context + 4.3.2.RELEASE + + + org.springframework + spring-test + 4.3.2.RELEASE + + + + org.aspectj + aspectjweaver + 1.8.6 + + + org.aspectj + aspectjrt + 1.8.6 + + + + + cglib + cglib + 3.2.2 + + + + + org.hibernate + hibernate-core + 5.1.0.Final + + + org.hibernate + hibernate-entitymanager + 5.1.0.Final + + + + + mysql + mysql-connector-java + 5.1.34 + + + + + com.alibaba + druid + 1.0.19 + + + + + + org.springframework.data + spring-data-jpa + 1.10.4.RELEASE + + + + + \ No newline at end of file diff --git a/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/Application.java b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/Application.java new file mode 100644 index 0000000..cbebadb --- /dev/null +++ b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/Application.java @@ -0,0 +1,17 @@ +package cn.mrdear.provider; + +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import java.io.IOException; + +/** + * @author Niu Li + * @since 2017/6/12 + */ +public class Application { + public static void main(String[] args) throws IOException { + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("applicationContext.xml"); + context.start(); + System.in.read(); // 为保证服务一直开着，利用输入流的阻塞来模拟 + } +} diff --git a/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/convert/UserConvert.java b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/convert/UserConvert.java new file mode 100644 index 0000000..67ae9ca --- /dev/null +++ b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/convert/UserConvert.java @@ -0,0 +1,42 @@ +package cn.mrdear.provider.convert; + +import org.springframework.beans.BeanUtils; +import org.springframework.util.CollectionUtils; + +import cn.mrdear.client.dto.UserDTO; +import cn.mrdear.provider.domain.User; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author Niu Li + * @since 2017/6/12 + */ +public class UserConvert { + + public static UserDTO toDTO(User user) { + UserDTO userDTO = new UserDTO(); + BeanUtils.copyProperties(user,userDTO); + return userDTO; + } + + + public static List toDTOS(List users) { + if (CollectionUtils.isEmpty(users)) { + return new ArrayList<>(1); + } + List results = new ArrayList<>(); + return users.stream().map(UserConvert::toDTO) + .collect(Collectors.toList()); + } + + + public static User toDO(UserDTO userDTO) { + User user = new User(); + BeanUtils.copyProperties(userDTO,user); + return user; + } + +} diff --git a/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/dao/UserRepository.java b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/dao/UserRepository.java new file mode 100644 index 0000000..6b068b4 --- /dev/null +++ b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/dao/UserRepository.java @@ -0,0 +1,24 @@ +package cn.mrdear.provider.dao; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import cn.mrdear.provider.domain.User; + +import java.util.Collection; +import java.util.List; + +/** + * JPA repo层 + * @author Niu Li + * @since 2017/6/12 + */ +public interface UserRepository extends JpaRepository{ + + User findById(Long id); + + @Query("select p from User p where id in (?1)") + List queryByIds(Collection ids); + + +} diff --git a/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/domain/User.java b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/domain/User.java new file mode 100644 index 0000000..81849e5 --- /dev/null +++ b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/domain/User.java @@ -0,0 +1,39 @@ +package cn.mrdear.provider.domain; + +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; + +import java.io.Serializable; + +/** + * 用户实体类,对应数据库 + * @author Niu Li + * @since 2017/6/12 + */ +@Data +@Entity +@Table(name = "user") +public class User implements Serializable{ + + private static final long serialVersionUID = 1793488098966504793L; + @Id + @GeneratedValue + private Long id; + + private String username; + + private String password; + + private Integer age; + + private String nickname; + + private String mail; + + private String memo; + +} diff --git a/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/service/UserServiceImpl.java b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/service/UserServiceImpl.java new file mode 100644 index 0000000..082f809 --- /dev/null +++ b/Dubbo-Demo/Service-Provider/src/main/java/cn/mrdear/provider/service/UserServiceImpl.java @@ -0,0 +1,51 @@ +package cn.mrdear.provider.service; + +import com.alibaba.dubbo.config.annotation.Service; + +import cn.mrdear.client.dto.UserDTO; +import cn.mrdear.client.service.IUserService; +import cn.mrdear.provider.convert.UserConvert; +import cn.mrdear.provider.dao.UserRepository; +import cn.mrdear.provider.domain.User; + +import javax.annotation.Resource; + +import java.util.Collection; +import java.util.List; + +/** + * 用户服务的具体实现,作为服务提供方提供出去 + * @author Niu Li + * @since 2017/6/12 + */ +@Service(version = "1.0.0") +public class UserServiceImpl implements IUserService { + + @Resource + private UserRepository userRepository; + + @Override + public UserDTO findById(Long id) { + User user = userRepository.findById(id); + return UserConvert.toDTO(user); + } + + @Override + public List queryByIds(Collection ids) { + List users = userRepository.queryByIds(ids); + return UserConvert.toDTOS(users); + } + + @Override + public UserDTO updateById(UserDTO userDTO) { + User user = UserConvert.toDO(userDTO); + userRepository.save(user); + return this.findById(userDTO.getId()); + } + + @Override + public Boolean deleteById(Long id) { + userRepository.delete(id); + return true; + } +} diff --git a/Dubbo-Demo/Service-Provider/src/main/resources/applicationContext.xml b/Dubbo-Demo/Service-Provider/src/main/resources/applicationContext.xml new file mode 100644 index 0000000..c811fad --- /dev/null +++ b/Dubbo-Demo/Service-Provider/src/main/resources/applicationContext.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.hibernate.dialect.MySQL5Dialect + + false + + false + + false + + none + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SSM--Demo/src/main/resources/db.properties b/Dubbo-Demo/Service-Provider/src/main/resources/db.properties similarity index 77% rename from SSM--Demo/src/main/resources/db.properties rename to Dubbo-Demo/Service-Provider/src/main/resources/db.properties index cf0c54d..2228684 100644 --- a/SSM--Demo/src/main/resources/db.properties +++ b/Dubbo-Demo/Service-Provider/src/main/resources/db.properties @@ -1,5 +1,6 @@ jdbc.driver=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://localhost:3306/ssm?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 +jdbc.url=jdbc:mysql://127.0.0.1:3306/ssm?useUnicode=true&characterEncoding=utf8&characterSetResults\ + =utf8 jdbc.username=root jdbc.password=7946521 diff --git a/Dubbo-Demo/Service-Provider/src/main/resources/h2/data.sql b/Dubbo-Demo/Service-Provider/src/main/resources/h2/data.sql new file mode 100644 index 0000000..a09f7a8 --- /dev/null +++ b/Dubbo-Demo/Service-Provider/src/main/resources/h2/data.sql @@ -0,0 +1,6 @@ +INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('zhangsan', + '123456', 18, '张三', '1111@qq.com', 'hahahah'); +INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('lis', +'123456', 19, '李四', '123131@qq.com', 'xixiixxi'); +INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('wanger', +'123456', 29, '王二', '12131984@qq.com', 'dqdh'); \ No newline at end of file diff --git a/Dubbo-Demo/Service-Provider/src/main/resources/h2/schema.sql b/Dubbo-Demo/Service-Provider/src/main/resources/h2/schema.sql new file mode 100644 index 0000000..8de82c2 --- /dev/null +++ b/Dubbo-Demo/Service-Provider/src/main/resources/h2/schema.sql @@ -0,0 +1,10 @@ +DROP TABLE user if exist; +create table user ( + id INT(11) AUTO_INCREMENT PRIMARY KEY , + username VARCHAR(255), + password VARCHAR(255), + age INT(3), + nickname VARCHAR(255), + mail VARCHAR(255), + memo VARCHAR(255), + ); \ No newline at end of file diff --git a/Dubbo-Demo/Service-Provider/src/main/resources/logback.xml b/Dubbo-Demo/Service-Provider/src/main/resources/logback.xml new file mode 100644 index 0000000..d68cd15 --- /dev/null +++ b/Dubbo-Demo/Service-Provider/src/main/resources/logback.xml @@ -0,0 +1,19 @@ + + + + + + + + %d{HH:mm:ss} [%t] %logger{5} [%line] %p - %msg%n + + + + + + + + + + + \ No newline at end of file diff --git a/Dubbo-Demo/Service-Provider/src/test/java/cn/mrdear/test/UserServiceTest.java b/Dubbo-Demo/Service-Provider/src/test/java/cn/mrdear/test/UserServiceTest.java new file mode 100644 index 0000000..3a50744 --- /dev/null +++ b/Dubbo-Demo/Service-Provider/src/test/java/cn/mrdear/test/UserServiceTest.java @@ -0,0 +1,31 @@ +package cn.mrdear.test; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import cn.mrdear.client.dto.UserDTO; +import cn.mrdear.provider.service.UserServiceImpl; + +import javax.annotation.Resource; + +/** + * @author Niu Li + * @since 2017/6/13 + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations = "classpath:applicationContext.xml") +public class UserServiceTest { + + @Resource + private UserServiceImpl userService; + + @Test + public void testFindById() { + UserDTO userDTO = userService.findById(1L); + Assert.assertNotNull(userDTO); + } + +} diff --git a/Dubbo-Demo/Service-Provider/src/test/resources/applicationContext.xml b/Dubbo-Demo/Service-Provider/src/test/resources/applicationContext.xml new file mode 100644 index 0000000..0192b9b --- /dev/null +++ b/Dubbo-Demo/Service-Provider/src/test/resources/applicationContext.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.hibernate.dialect.MySQL5Dialect + + false + + false + + false + + none + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Dubbo-Demo/Service-Provider/src/test/resources/db.properties b/Dubbo-Demo/Service-Provider/src/test/resources/db.properties new file mode 100644 index 0000000..2228684 --- /dev/null +++ b/Dubbo-Demo/Service-Provider/src/test/resources/db.properties @@ -0,0 +1,24 @@ +jdbc.driver=com.mysql.jdbc.Driver +jdbc.url=jdbc:mysql://127.0.0.1:3306/ssm?useUnicode=true&characterEncoding=utf8&characterSetResults\ + =utf8 +jdbc.username=root +jdbc.password=7946521 + +filters:stat + +maxActive:20 +initialSize:1 +maxWait:60000 +minIdle:10 + +timeBetweenEvictionRunsMillis:60000 +minEvictableIdleTimeMillis:300000 + +testWhileIdle:true +testOnBorrow:false +testOnReturn:false + +maxOpenPreparedStatements:20 +removeAbandoned:true +removeAbandonedTimeout:1800 +logAbandoned:true diff --git a/Dubbo-Demo/Service-Provider/src/test/resources/h2/data.sql b/Dubbo-Demo/Service-Provider/src/test/resources/h2/data.sql new file mode 100644 index 0000000..a09f7a8 --- /dev/null +++ b/Dubbo-Demo/Service-Provider/src/test/resources/h2/data.sql @@ -0,0 +1,6 @@ +INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('zhangsan', + '123456', 18, '张三', '1111@qq.com', 'hahahah'); +INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('lis', +'123456', 19, '李四', '123131@qq.com', 'xixiixxi'); +INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('wanger', +'123456', 29, '王二', '12131984@qq.com', 'dqdh'); \ No newline at end of file diff --git a/Dubbo-Demo/Service-Provider/src/test/resources/h2/schema.sql b/Dubbo-Demo/Service-Provider/src/test/resources/h2/schema.sql new file mode 100644 index 0000000..8de82c2 --- /dev/null +++ b/Dubbo-Demo/Service-Provider/src/test/resources/h2/schema.sql @@ -0,0 +1,10 @@ +DROP TABLE user if exist; +create table user ( + id INT(11) AUTO_INCREMENT PRIMARY KEY , + username VARCHAR(255), + password VARCHAR(255), + age INT(3), + nickname VARCHAR(255), + mail VARCHAR(255), + memo VARCHAR(255), + ); \ No newline at end of file diff --git a/Dubbo-Demo/Service-Provider/src/test/resources/logback.xml b/Dubbo-Demo/Service-Provider/src/test/resources/logback.xml new file mode 100644 index 0000000..d68cd15 --- /dev/null +++ b/Dubbo-Demo/Service-Provider/src/test/resources/logback.xml @@ -0,0 +1,19 @@ + + + + + + + + %d{HH:mm:ss} [%t] %logger{5} [%line] %p - %msg%n + + + + + + + + + + + \ No newline at end of file diff --git a/Dubbo-Demo/doc/readme.md b/Dubbo-Demo/doc/readme.md new file mode 100644 index 0000000..47335f0 --- /dev/null +++ b/Dubbo-Demo/doc/readme.md @@ -0,0 +1,7 @@ + +1. 启动需要先下载zk,然后启动 +2. Provider中spring配置文件host改成本机ip地址,然后启动 +3. 启动Consumer +4. 可下载Simple-monitor http://download.csdn.net/detail/liweifengwf/7864009 +5. 可下载dubbo-admin http://download.csdn.net/detail/leiyong0326/9548973 +6. dubbo的调用基本就是这样,大多数规则都可以在admin中配置也可以在spring注册服务和引用的时候配置 \ No newline at end of file diff --git a/Dubbo-Demo/pom.xml b/Dubbo-Demo/pom.xml new file mode 100644 index 0000000..bd21a12 --- /dev/null +++ b/Dubbo-Demo/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + cn.mrdear.dubbo + Dubbo-Demo + pom + 1.0.0 + Dubbo-demo + + Service-Client + Service-Consumer + Service-Provider + + + + + + org.projectlombok + lombok + 1.16.14 + + + junit + junit + 4.12 + + + com.google.guava + guava + 21.0 + + + + org.slf4j + slf4j-api + 1.7.7 + + + org.slf4j + jcl-over-slf4j + 1.7.7 + + + ch.qos.logback + logback-core + 1.1.2 + + + org.logback-extensions + logback-ext-spring + 0.1.4 + + + ch.qos.logback + logback-classic + 1.1.2 + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + UTF-8 + + + + + + \ No newline at end of file diff --git a/Excel-Demo/pom.xml b/Excel-Demo/pom.xml new file mode 100644 index 0000000..241336c --- /dev/null +++ b/Excel-Demo/pom.xml @@ -0,0 +1,66 @@ + + + 4.0.0 + + cn.mrdear.poi + Excel-Demo + 1.0-SNAPSHOT + Excel-Demo + + + + org.apache.poi + poi + 3.15 + + + org.apache.poi + poi-ooxml + 3.15 + + + junit + junit + 4.10 + + + + + org.slf4j + slf4j-api + 1.7.2 + + + org.slf4j + jcl-over-slf4j + 1.7.2 + + + ch.qos.logback + logback-core + 1.1.2 + + + ch.qos.logback + logback-classic + 1.1.2 + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + + \ No newline at end of file diff --git a/Excel-Demo/src/main/java/cn/mrdear/excel/constant/ExcelType.java b/Excel-Demo/src/main/java/cn/mrdear/excel/constant/ExcelType.java new file mode 100644 index 0000000..45018ae --- /dev/null +++ b/Excel-Demo/src/main/java/cn/mrdear/excel/constant/ExcelType.java @@ -0,0 +1,10 @@ +package cn.mrdear.excel.constant; + +/** + * 定义excel格式 + * @author Niu Li + * @since 2017/3/17 + */ +public enum ExcelType { + XLS, XLSX; +} diff --git a/Excel-Demo/src/main/java/cn/mrdear/excel/core/ExcelExtractor.java b/Excel-Demo/src/main/java/cn/mrdear/excel/core/ExcelExtractor.java new file mode 100644 index 0000000..0c8bfd5 --- /dev/null +++ b/Excel-Demo/src/main/java/cn/mrdear/excel/core/ExcelExtractor.java @@ -0,0 +1,115 @@ +package cn.mrdear.excel.core; + +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import cn.mrdear.excel.constant.ExcelType; +import cn.mrdear.excel.util.BeanUtils; + +/** + * excel解析 + * + * @author Niu Li + * @since 2017/3/17 + */ +public class ExcelExtractor { + + private static Logger logger = LoggerFactory.getLogger(ExcelFormat.class); + + /** + * 解析excel,默认第一行为表头 + * + * @param type excel类型 + * @param excel excel输入流 + * @param tClass 要生成的实体类 + * @param headerMapper 对应解析表格 + * @return 解析后集合 + * @throws IllegalArgumentException 解析错误 + */ + public static List extractFrom(ExcelType type, InputStream excel, Class tClass, + Map headerMapper, Integer sheetIndex) throws IllegalArgumentException, IOException { + Workbook workbook; + try { + workbook = type.equals(ExcelType.XLS) ? new HSSFWorkbook(excel) : new XSSFWorkbook(excel); + } catch (IOException e) { + throw new IllegalArgumentException("未知的表格类型"); + } + //解析表头.默认第一行为表头 + Sheet sheet = workbook.getSheetAt(sheetIndex); + Iterator rowIterator = sheet.rowIterator(); + //第一行 + Row firstRow = rowIterator.next(); + Iterator firstCell = firstRow.cellIterator(); + + Set existHeaderSet = new HashSet<>(); + List existHeader = new ArrayList<>(headerMapper.size()); + firstCell.forEachRemaining(cell -> { + if (cell.getCellType() != Cell.CELL_TYPE_STRING) { + throw new IllegalArgumentException("第一行必须全部为字符串,第" + cell.getColumnIndex() + 1 + "有问题"); + } + existHeaderSet.add(cell.getStringCellValue()); + existHeader.add(cell.getStringCellValue()); + }); + //查询出不存在的表头 + for (String s : headerMapper.keySet()) { + if (!existHeaderSet.contains(s)) { + throw new IllegalArgumentException("不存在的表头:" + s); + } + } + //开始解析表单 + Integer lineNumber = 0; + List result = new ArrayList(); + try { + while (rowIterator.hasNext()){ + Row x = rowIterator.next(); + lineNumber++; + Map tempMap = new HashMap<>(); + Iterator cellIterator = x.cellIterator(); + cellIterator.forEachRemaining(y -> { + Object value = null; + switch (y.getCellType()) { + case Cell.CELL_TYPE_STRING: + value = y.getStringCellValue(); + break; + case Cell.CELL_TYPE_BOOLEAN: + value = y.getBooleanCellValue(); + break; + case Cell.CELL_TYPE_NUMERIC: + value = y.getNumericCellValue(); + break; + case Cell.CELL_TYPE_ERROR: + value = ""; + break; + case Cell.CELL_TYPE_BLANK: + value = ""; + break; + default: + value = ""; + } + String key = headerMapper.get(existHeader.get(y.getColumnIndex())); + tempMap.put(key, value); + }); + result.add(BeanUtils.map2Bean(tempMap, tClass)); + } + } catch (Exception e) { + logger.error("第{}行解析错误",lineNumber); + } + return result; + } +} diff --git a/Excel-Demo/src/main/java/cn/mrdear/excel/core/ExcelFormat.java b/Excel-Demo/src/main/java/cn/mrdear/excel/core/ExcelFormat.java new file mode 100644 index 0000000..39b05b9 --- /dev/null +++ b/Excel-Demo/src/main/java/cn/mrdear/excel/core/ExcelFormat.java @@ -0,0 +1,172 @@ +package cn.mrdear.excel.core; + +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import cn.mrdear.excel.constant.ExcelType; +import cn.mrdear.excel.util.BeanUtils; + +/** + * 工具类入口 + * @author Niu Li + * @since 2017/2/23 + */ +public class ExcelFormat { + + private static Logger logger = LoggerFactory.getLogger(ExcelFormat.class); + //该表格的工作本 + private Workbook workbook; + + /** + * 控制表头,其中键为对应DTO的字段,值为表头显示内容 + */ + private LinkedHashMap headers; + /** + * 具体表内容,只接受DTO + */ + private List contents; + + /** + * 入口函数 + * @param headers 表单头部 + * @param content 表单内容DTO + * @return this表单对象 + */ + public static ExcelFormat from(LinkedHashMap headers,List content){ + return new ExcelFormat(headers,content); + } + + /** + * 在此workbook中增加另一个sheet + * @param headers 新sheet的表头 + * @param content 新sheet的内容 + * @return this + */ + public ExcelFormat andForm(LinkedHashMap headers,List content){ + this.headers = headers; + this.contents = content; + return this; + } + + + /** + * 端点方法,生成最终的表单 + * @return this + */ + public ExcelFormat build(String sheetName){ + //创建字表 + Sheet sheet = sheetName == null ? workbook.createSheet() : workbook.createSheet(sheetName); + //创建表头 + int rowNum = 0; + Row headerRow = sheet.createRow(rowNum++); + List headers = new ArrayList<>(this.headers.keySet());//表头 + List values = new ArrayList<>(this.headers.values());//对应值 + for (int i = 0; i < headers.size(); i++) { + Cell cell = headerRow.createCell(i); + cell.setCellValue(values.get(i)==null?headers.get(i):values.get(i)); + } + //构造表单内容 + try { + for (Object content : contents) { + Map contentMap = BeanUtils.bean2Map(content); + Row current = sheet.createRow(rowNum++); + for (int i = 0; i < headers.size(); i++) { + Cell cell = current.createCell(i); + Object obj = contentMap.get(headers.get(i)); + if (obj == null) { + obj = ""; + } + if (obj instanceof String) { + cell.setCellValue((String) obj); + } else if (obj instanceof Integer) { + cell.setCellValue((Integer) obj); + } else if (obj instanceof Long) { + cell.setCellValue((Long) obj); + } else if (obj instanceof Double) { + cell.setCellValue((Double) obj); + } else if (obj instanceof Date) { + cell.setCellValue((Date) obj); + } else if (obj instanceof Boolean) { + cell.setCellValue((Boolean) obj); + } else { + throw new IllegalArgumentException("unsupported cell type"); + } + } + } + } catch (IllegalAccessException e) { + logger.error("parse excel fail ",e); + } + //设置样式 + + return this; + } + /** + * 私有化构造函数 + */ + private ExcelFormat(LinkedHashMap headers, List contents) { + this.headers = headers; + this.contents = contents; + } + + /** + * 调用该方法后,此workbook则写入关闭 + * @param dirIncludedFileName 最终生成文件名称 + */ + public void write(String dirIncludedFileName){ + try { + File file = new File(dirIncludedFileName); + FileOutputStream os = new FileOutputStream(file); + workbook.write(os); + os.close(); + } catch (IOException e) { + logger.error("write excel fail ",e); + }finally { + try { + if (workbook != null) workbook.close(); + } catch (IOException e) { + logger.error("write excel fail ",e); + } + } + } + + /** + * 结果写到一个输出流中 + * @param os 目标流 + */ + public void write(OutputStream os) { + try { + workbook.write(os); + workbook.close(); + } catch (IOException e) { + logger.error("write excel fail ",e); + } + } + + + /** + * 链式调用设置生成文档格式 + * @param type 指定格式 + * @return this + */ + public ExcelFormat excelType(ExcelType type){ + workbook = type == ExcelType.XLS?new HSSFWorkbook():new XSSFWorkbook(); + return this; + } + +} diff --git a/Excel-Demo/src/main/java/cn/mrdear/excel/util/BeanUtils.java b/Excel-Demo/src/main/java/cn/mrdear/excel/util/BeanUtils.java new file mode 100644 index 0000000..814dd87 --- /dev/null +++ b/Excel-Demo/src/main/java/cn/mrdear/excel/util/BeanUtils.java @@ -0,0 +1,68 @@ +package cn.mrdear.excel.util; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; + +/** + * 对bean一些转换方法 + * + * @author Niu Li + * @since 2017/2/23 + */ +public class BeanUtils { + + /** + * 转换bean为map + * + * @param source 要转换的bean + * @param bean类型 + * @return 转换结果 + */ + public static Map bean2Map(T source) throws IllegalAccessException { + Map result = new HashMap<>(); + + Class sourceClass = source.getClass(); + //拿到所有的字段,不包括继承的字段 + Field[] sourceFiled = sourceClass.getDeclaredFields(); + for (Field field : sourceFiled) { + field.setAccessible(true);//设置可访问,不然拿不到private + //配置了注解的话则使用注解名称,作为header字段 + FieldName fieldName = field.getAnnotation(FieldName.class); + if (fieldName == null) { + result.put(field.getName(), field.get(source)); + } else { + if (fieldName.Ignore()) continue; + result.put(fieldName.value(), field.get(source)); + } + } + return result; + } + + /** + * map转bean + * @param source map属性 + * @param instance 要转换成的备案 + * @return 该bean + */ + public static T map2Bean(Map source, Class instance) { + try { + T object = instance.newInstance(); + Field[] fields = object.getClass().getDeclaredFields(); + for (Field field : fields) { + field.setAccessible(true); + FieldName fieldName = field.getAnnotation(FieldName.class); + if (fieldName != null){ + field.set(object,source.get(fieldName.value())); + }else { + field.set(object,source.get(field.getName())); + } + } + return object; + } catch (InstantiationException | IllegalAccessException e) { + e.printStackTrace(); + } + return null; + } +} + diff --git a/Excel-Demo/src/main/java/cn/mrdear/excel/util/FieldName.java b/Excel-Demo/src/main/java/cn/mrdear/excel/util/FieldName.java new file mode 100644 index 0000000..61ed7ea --- /dev/null +++ b/Excel-Demo/src/main/java/cn/mrdear/excel/util/FieldName.java @@ -0,0 +1,24 @@ +package cn.mrdear.excel.util; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 自定义字段名 + * @author Niu Li + * @since 2017/2/23 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER}) +public @interface FieldName { + /** + * 字段名 + */ + String value() default ""; + /** + * 是否忽略 + */ + boolean Ignore() default false; +} diff --git a/Excel-Demo/src/test/java/cn/mrdear/excel/BeanUtilTest.java b/Excel-Demo/src/test/java/cn/mrdear/excel/BeanUtilTest.java new file mode 100644 index 0000000..211150a --- /dev/null +++ b/Excel-Demo/src/test/java/cn/mrdear/excel/BeanUtilTest.java @@ -0,0 +1,27 @@ +package cn.mrdear.excel; + +import org.junit.Test; + +import java.util.Map; + +import cn.mrdear.excel.util.BeanUtils; + +/** + * @author Niu Li + * @since 2017/2/23 + */ +public class BeanUtilTest { + + + @Test + public void test() throws IllegalAccessException { + Demo demo = new Demo(); + demo.setUserName("111"); + demo.setPassWord("222"); + Map map = BeanUtils.bean2Map(demo); + System.out.println(map); + Demo demo1 = BeanUtils.map2Bean(map,Demo.class); + System.out.println(demo1); + } + +} diff --git a/Excel-Demo/src/test/java/cn/mrdear/excel/Demo.java b/Excel-Demo/src/test/java/cn/mrdear/excel/Demo.java new file mode 100644 index 0000000..dba64d2 --- /dev/null +++ b/Excel-Demo/src/test/java/cn/mrdear/excel/Demo.java @@ -0,0 +1,45 @@ +package cn.mrdear.excel; + +import cn.mrdear.excel.util.FieldName; + +/** + * @author Niu Li + * @since 2017/2/23 + */ +public class Demo { + + public Demo(String username, String password) { + this.userName = username; + this.passWord = password; + } + public Demo() { + } + //fildName字段需要和header对应 + @FieldName(value = "username") + private String userName; + private String passWord; + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPassWord() { + return passWord; + } + + public void setPassWord(String passWord) { + this.passWord = passWord; + } + + @Override + public String toString() { + return "Demo{" + + "userName='" + userName + '\'' + + ", passWord='" + passWord + '\'' + + '}'; + } +} diff --git a/Excel-Demo/src/test/java/cn/mrdear/excel/ExcelFormatTest.java b/Excel-Demo/src/test/java/cn/mrdear/excel/ExcelFormatTest.java new file mode 100644 index 0000000..735894c --- /dev/null +++ b/Excel-Demo/src/test/java/cn/mrdear/excel/ExcelFormatTest.java @@ -0,0 +1,65 @@ +package cn.mrdear.excel; + +import org.junit.Before; +import org.junit.Test; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; + +import cn.mrdear.excel.constant.ExcelType; +import cn.mrdear.excel.core.ExcelExtractor; +import cn.mrdear.excel.core.ExcelFormat; + +/** + * @author Niu Li + * @since 2017/2/23 + */ +public class ExcelFormatTest { + LinkedHashMap headers; + LinkedHashMap extractorHeaders; + + @Before + public void init() { + headers = new LinkedHashMap<>(); + extractorHeaders = new LinkedHashMap<>(); + headers.put("username","用户名"); + headers.put("passWord", "密码"); + extractorHeaders.put("用户名","username"); + extractorHeaders.put("密码", "passWord"); + } + + @Test + public void testMake() { + List content = new ArrayList<>(); + Demo demo1 = new Demo("1","1"); + Demo demo2 = new Demo("2","2"); + Demo demo3 = new Demo("3","3"); + Demo demo4 = new Demo("4","4"); + content.add(demo1); + content.add(demo2); + content.add(demo3); + content.add(demo4); + + //写入 + ExcelFormat.from(headers,content) + .excelType(ExcelType.XLS) + .build("niuli") + .write("/tmp/niuli.xls"); + System.out.println("写入成功"); + //读取 + try { + InputStream in = new FileInputStream(new File("/tmp/niuli.xls")); + List result = ExcelExtractor.extractFrom(ExcelType.XLS,in,Demo.class, + extractorHeaders,0); + System.out.println(result); + } catch (IOException e) { + e.printStackTrace(); + } + System.out.println("读取成功"); + } +} diff --git a/HtmlUnit-Demo/.idea/compiler.xml b/HtmlUnit-Demo/.idea/compiler.xml deleted file mode 100644 index fd9d725..0000000 --- a/HtmlUnit-Demo/.idea/compiler.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/copyright/profiles_settings.xml b/HtmlUnit-Demo/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/HtmlUnit-Demo/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/deployment.xml b/HtmlUnit-Demo/.idea/deployment.xml deleted file mode 100644 index 25a0408..0000000 --- a/HtmlUnit-Demo/.idea/deployment.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/encodings.xml b/HtmlUnit-Demo/.idea/encodings.xml deleted file mode 100644 index 247aa7f..0000000 --- a/HtmlUnit-Demo/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml b/HtmlUnit-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml deleted file mode 100644 index 3888159..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml b/HtmlUnit-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml deleted file mode 100644 index 27424a1..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__commons_io_commons_io_2_5.xml b/HtmlUnit-Demo/.idea/libraries/Maven__commons_io_commons_io_2_5.xml deleted file mode 100644 index 67c2ad2..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__commons_io_commons_io_2_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/HtmlUnit-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml deleted file mode 100644 index eab40b3..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_cssparser_cssparser_0_9_20.xml b/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_cssparser_cssparser_0_9_20.xml deleted file mode 100644 index 69204fd..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_cssparser_cssparser_0_9_20.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_2_23.xml b/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_2_23.xml deleted file mode 100644 index 18afd08..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_2_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_core_js_2_23.xml b/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_core_js_2_23.xml deleted file mode 100644 index 85f6b10..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_core_js_2_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_neko_htmlunit_2_23.xml b/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_neko_htmlunit_2_23.xml deleted file mode 100644 index dc921d3..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__net_sourceforge_htmlunit_neko_htmlunit_2_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml deleted file mode 100644 index 78cfcd3..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml deleted file mode 100644 index fdb7ead..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml deleted file mode 100644 index 3a5aa19..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_2.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_2.xml deleted file mode 100644 index 4b2025a..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_2_18_v20160721.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_2_18_v20160721.xml deleted file mode 100644 index eb77d34..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_2_18_v20160721.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_2_18_v20160721.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_2_18_v20160721.xml deleted file mode 100644 index dadc591..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_2_18_v20160721.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_2_18_v20160721.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_2_18_v20160721.xml deleted file mode 100644 index 01ec5bd..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_2_18_v20160721.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_2_18_v20160721.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_2_18_v20160721.xml deleted file mode 100644 index 8a37d8d..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_2_18_v20160721.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_2_18_v20160721.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_2_18_v20160721.xml deleted file mode 100644 index 74968e1..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_2_18_v20160721.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml b/HtmlUnit-Demo/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml deleted file mode 100644 index af3d414..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__xalan_serializer_2_7_2.xml b/HtmlUnit-Demo/.idea/libraries/Maven__xalan_serializer_2_7_2.xml deleted file mode 100644 index 8fd4cc9..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__xalan_serializer_2_7_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__xalan_xalan_2_7_2.xml b/HtmlUnit-Demo/.idea/libraries/Maven__xalan_xalan_2_7_2.xml deleted file mode 100644 index c806972..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__xalan_xalan_2_7_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml b/HtmlUnit-Demo/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml deleted file mode 100644 index 285d5e8..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml b/HtmlUnit-Demo/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml deleted file mode 100644 index 9aadd29..0000000 --- a/HtmlUnit-Demo/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/misc.xml b/HtmlUnit-Demo/.idea/misc.xml deleted file mode 100644 index 8cd8b9b..0000000 --- a/HtmlUnit-Demo/.idea/misc.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/modules.xml b/HtmlUnit-Demo/.idea/modules.xml deleted file mode 100644 index 9177726..0000000 --- a/HtmlUnit-Demo/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/uiDesigner.xml b/HtmlUnit-Demo/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/HtmlUnit-Demo/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/.idea/workspace.xml b/HtmlUnit-Demo/.idea/workspace.xml deleted file mode 100644 index 7a55cba..0000000 --- a/HtmlUnit-Demo/.idea/workspace.xml +++ /dev/null @@ -1,1477 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - project - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - C:\Users\牛李\AppData\Roaming\Subversion - - - - - 1475907637491 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No facets are configured - - - - - - - - app - - - - - - - - 1.8 - - - - - - - - 爬虫项目 - - - - - - - - IntelliJ IDEA IU-162.2032.8 - - - - - - - - Maven: com.alibaba:fastjson:1.2.14 - - - - - - - - \ No newline at end of file diff --git a/HtmlUnit-Demo/pom.xml b/HtmlUnit-Demo/pom.xml index e88f32d..9f80981 100644 --- a/HtmlUnit-Demo/pom.xml +++ b/HtmlUnit-Demo/pom.xml @@ -5,10 +5,10 @@ 4.0.0 cn.mrdear - Html-Unit + HtmlUnit-Demo 1.0 jar - Html-Unit + HtmlUnit-Demo diff --git a/JPA-Demo/.idea/artifacts/TestJPA_war.xml b/JPA-Demo/.idea/artifacts/TestJPA_war.xml deleted file mode 100644 index aa2cab2..0000000 --- a/JPA-Demo/.idea/artifacts/TestJPA_war.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - $PROJECT_DIR$/target - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/artifacts/TestJPA_war_exploded.xml b/JPA-Demo/.idea/artifacts/TestJPA_war_exploded.xml deleted file mode 100644 index 66fd06e..0000000 --- a/JPA-Demo/.idea/artifacts/TestJPA_war_exploded.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - $PROJECT_DIR$/target/testjpa - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/compiler.xml b/JPA-Demo/.idea/compiler.xml deleted file mode 100644 index fdebc2f..0000000 --- a/JPA-Demo/.idea/compiler.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/copyright/profiles_settings.xml b/JPA-Demo/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/JPA-Demo/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/dataSources.local.xml b/JPA-Demo/.idea/dataSources.local.xml deleted file mode 100644 index 3f7739c..0000000 --- a/JPA-Demo/.idea/dataSources.local.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - #@ - ` - - - master_key - root - test: - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/dataSources.xml b/JPA-Demo/.idea/dataSources.xml deleted file mode 100644 index 7d69e24..0000000 --- a/JPA-Demo/.idea/dataSources.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - mysql - true - com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/test - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/dataSources/9b9d41a7-087f-4d48-b6f5-6a32ff67416e.xml b/JPA-Demo/.idea/dataSources/9b9d41a7-087f-4d48-b6f5-6a32ff67416e.xml deleted file mode 100644 index d99b5f6..0000000 --- a/JPA-Demo/.idea/dataSources/9b9d41a7-087f-4d48-b6f5-6a32ff67416e.xml +++ /dev/null @@ -1,5359 +0,0 @@ - - - - - 1 - - - - - - - - - -

- - 1 - int(11)|0 - 1 - 1 - - - 2 - varchar(30)|0 - - - 3 - varchar(30)|0 - - - 4 - varchar(30)|0 - - - 5 - varchar(30)|0 - - - id - 1 - - - 1 - int(11)|0 - 1 - 1 - - - 2 - varchar(30)|0 - - - 3 - varchar(255)|0 - - - 4 - int(11)|0 - - - id - 1 - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/dataSources/b417aeb4-20af-4470-9fe0-bc190e31e7a1/storage.xml b/JPA-Demo/.idea/dataSources/b417aeb4-20af-4470-9fe0-bc190e31e7a1/storage.xml deleted file mode 100644 index df5f60e..0000000 --- a/JPA-Demo/.idea/dataSources/b417aeb4-20af-4470-9fe0-bc190e31e7a1/storage.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/JPA-Demo/.idea/deployment.xml b/JPA-Demo/.idea/deployment.xml deleted file mode 100644 index 25a0408..0000000 --- a/JPA-Demo/.idea/deployment.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/encodings.xml b/JPA-Demo/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/JPA-Demo/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/JPA-Demo/.idea/libraries/Maven__antlr_antlr_2_7_7.xml deleted file mode 100644 index b8d93d8..0000000 --- a/JPA-Demo/.idea/libraries/Maven__antlr_antlr_2_7_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/JPA-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml deleted file mode 100644 index a8b0d9c..0000000 --- a/JPA-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/JPA-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml deleted file mode 100644 index 1c76d0b..0000000 --- a/JPA-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_19.xml b/JPA-Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_19.xml deleted file mode 100644 index 4a7f94b..0000000 --- a/JPA-Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_19.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__com_fasterxml_classmate_1_3_0.xml b/JPA-Demo/.idea/libraries/Maven__com_fasterxml_classmate_1_3_0.xml deleted file mode 100644 index 073c2de..0000000 --- a/JPA-Demo/.idea/libraries/Maven__com_fasterxml_classmate_1_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__com_google_code_findbugs_annotations_2_0_1.xml b/JPA-Demo/.idea/libraries/Maven__com_google_code_findbugs_annotations_2_0_1.xml deleted file mode 100644 index a3d1316..0000000 --- a/JPA-Demo/.idea/libraries/Maven__com_google_code_findbugs_annotations_2_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml b/JPA-Demo/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml deleted file mode 100644 index 0e66824..0000000 --- a/JPA-Demo/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__com_google_guava_guava_18_0.xml b/JPA-Demo/.idea/libraries/Maven__com_google_guava_guava_18_0.xml deleted file mode 100644 index bbd71d7..0000000 --- a/JPA-Demo/.idea/libraries/Maven__com_google_guava_guava_18_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__com_infradna_tool_bridge_method_annotation_1_13.xml b/JPA-Demo/.idea/libraries/Maven__com_infradna_tool_bridge_method_annotation_1_13.xml deleted file mode 100644 index 8d02d66..0000000 --- a/JPA-Demo/.idea/libraries/Maven__com_infradna_tool_bridge_method_annotation_1_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__com_mysema_codegen_codegen_0_6_8.xml b/JPA-Demo/.idea/libraries/Maven__com_mysema_codegen_codegen_0_6_8.xml deleted file mode 100644 index 0f3f194..0000000 --- a/JPA-Demo/.idea/libraries/Maven__com_mysema_codegen_codegen_0_6_8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__com_mysema_commons_mysema_commons_lang_0_2_4.xml b/JPA-Demo/.idea/libraries/Maven__com_mysema_commons_mysema_commons_lang_0_2_4.xml deleted file mode 100644 index 4c795db..0000000 --- a/JPA-Demo/.idea/libraries/Maven__com_mysema_commons_mysema_commons_lang_0_2_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__com_querydsl_querydsl_apt_4_1_4.xml b/JPA-Demo/.idea/libraries/Maven__com_querydsl_querydsl_apt_4_1_4.xml deleted file mode 100644 index 24c6748..0000000 --- a/JPA-Demo/.idea/libraries/Maven__com_querydsl_querydsl_apt_4_1_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__com_querydsl_querydsl_codegen_4_1_4.xml b/JPA-Demo/.idea/libraries/Maven__com_querydsl_querydsl_codegen_4_1_4.xml deleted file mode 100644 index ee7ff88..0000000 --- a/JPA-Demo/.idea/libraries/Maven__com_querydsl_querydsl_codegen_4_1_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__com_querydsl_querydsl_core_4_1_4.xml b/JPA-Demo/.idea/libraries/Maven__com_querydsl_querydsl_core_4_1_4.xml deleted file mode 100644 index e8e31bc..0000000 --- a/JPA-Demo/.idea/libraries/Maven__com_querydsl_querydsl_core_4_1_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__com_querydsl_querydsl_jpa_4_1_4.xml b/JPA-Demo/.idea/libraries/Maven__com_querydsl_querydsl_jpa_4_1_4.xml deleted file mode 100644 index 8b58469..0000000 --- a/JPA-Demo/.idea/libraries/Maven__com_querydsl_querydsl_jpa_4_1_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/JPA-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml deleted file mode 100644 index eab40b3..0000000 --- a/JPA-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/JPA-Demo/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml deleted file mode 100644 index 14681ee..0000000 --- a/JPA-Demo/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__javax_inject_javax_inject_1.xml b/JPA-Demo/.idea/libraries/Maven__javax_inject_javax_inject_1.xml deleted file mode 100644 index 93cf65a..0000000 --- a/JPA-Demo/.idea/libraries/Maven__javax_inject_javax_inject_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__javax_jdo_jdo_api_3_0_1.xml b/JPA-Demo/.idea/libraries/Maven__javax_jdo_jdo_api_3_0_1.xml deleted file mode 100644 index ee6078c..0000000 --- a/JPA-Demo/.idea/libraries/Maven__javax_jdo_jdo_api_3_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__javax_transaction_jta_1_1.xml b/JPA-Demo/.idea/libraries/Maven__javax_transaction_jta_1_1.xml deleted file mode 100644 index 3047243..0000000 --- a/JPA-Demo/.idea/libraries/Maven__javax_transaction_jta_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__junit_junit_4_12.xml b/JPA-Demo/.idea/libraries/Maven__junit_junit_4_12.xml deleted file mode 100644 index d411041..0000000 --- a/JPA-Demo/.idea/libraries/Maven__junit_junit_4_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_34.xml b/JPA-Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_34.xml deleted file mode 100644 index b984e59..0000000 --- a/JPA-Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_34.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/JPA-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml deleted file mode 100644 index 83cba3e..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jta_1_1_spec_1_1_1.xml b/JPA-Demo/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jta_1_1_spec_1_1_1.xml deleted file mode 100644 index a6f25db..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jta_1_1_spec_1_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_9.xml b/JPA-Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_9.xml deleted file mode 100644 index 112f7ca..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_4_3_1.xml b/JPA-Demo/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_4_3_1.xml deleted file mode 100644 index 6d46f7c..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_4_3_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/JPA-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml deleted file mode 100644 index f58bbc1..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml b/JPA-Demo/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml deleted file mode 100644 index ce34f42..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_hibernate_hibernate_core_5_1_0_Final.xml b/JPA-Demo/.idea/libraries/Maven__org_hibernate_hibernate_core_5_1_0_Final.xml deleted file mode 100644 index a871e06..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_hibernate_hibernate_core_5_1_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_1_0_Final.xml b/JPA-Demo/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_1_0_Final.xml deleted file mode 100644 index 9cf1471..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_1_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/JPA-Demo/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml deleted file mode 100644 index 6492b2b..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml b/JPA-Demo/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml deleted file mode 100644 index c21c9b0..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_jboss_jandex_2_0_0_Final.xml b/JPA-Demo/.idea/libraries/Maven__org_jboss_jandex_2_0_0_Final.xml deleted file mode 100644 index a74dcfd..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_jboss_jandex_2_0_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml b/JPA-Demo/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml deleted file mode 100644 index 186d87f..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_reflections_reflections_0_9_9.xml b/JPA-Demo/.idea/libraries/Maven__org_reflections_reflections_0_9_9.xml deleted file mode 100644 index 63d6d14..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_reflections_reflections_0_9_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/JPA-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml deleted file mode 100644 index 282edcb..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/JPA-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml deleted file mode 100644 index 1e67260..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_12_4_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_12_4_RELEASE.xml deleted file mode 100644 index f1c6daa..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_12_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_1_10_4_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_1_10_4_RELEASE.xml deleted file mode 100644 index 3d7ae60..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_1_10_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_3_0_RELEASE.xml deleted file mode 100644 index 80294b1..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_3_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_3_0_RELEASE.xml deleted file mode 100644 index 09b7e0c..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_3_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_context_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_context_4_3_0_RELEASE.xml deleted file mode 100644 index 3c94644..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_context_4_3_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_0_RELEASE.xml deleted file mode 100644 index ef485cc..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_core_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_core_4_3_0_RELEASE.xml deleted file mode 100644 index 7300f9e..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_core_4_3_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_3_0_RELEASE.xml deleted file mode 100644 index 099312a..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_3_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_0_RELEASE.xml deleted file mode 100644 index 7d27aaf..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_orm_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_orm_4_3_0_RELEASE.xml deleted file mode 100644 index c400a2d..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_orm_4_3_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_test_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_test_4_3_0_RELEASE.xml deleted file mode 100644 index 3029327..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_test_4_3_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_3_0_RELEASE.xml deleted file mode 100644 index 89e6704..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_3_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_web_4_3_0_RELEASE.xml b/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_web_4_3_0_RELEASE.xml deleted file mode 100644 index 61084b2..0000000 --- a/JPA-Demo/.idea/libraries/Maven__org_springframework_spring_web_4_3_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml b/JPA-Demo/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml deleted file mode 100644 index c36e717..0000000 --- a/JPA-Demo/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/misc.xml b/JPA-Demo/.idea/misc.xml deleted file mode 100644 index d559c98..0000000 --- a/JPA-Demo/.idea/misc.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/modules.xml b/JPA-Demo/.idea/modules.xml deleted file mode 100644 index 7b75f0c..0000000 --- a/JPA-Demo/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/sqldialects.xml b/JPA-Demo/.idea/sqldialects.xml deleted file mode 100644 index af0e43a..0000000 --- a/JPA-Demo/.idea/sqldialects.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/uiDesigner.xml b/JPA-Demo/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/JPA-Demo/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/.idea/workspace.xml b/JPA-Demo/.idea/workspace.xml deleted file mode 100644 index 69715e7..0000000 --- a/JPA-Demo/.idea/workspace.xml +++ /dev/null @@ -1,1905 +0,0 @@ - - - - - - - - - - - - - cn.mrdear.repository.PcardOrderRepository - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - findAll - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - project - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - C:\Users\NL\AppData\Roaming\Subversion - - - - - 1477877210784 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - TestJPA:war - - - - - - - - Web - - - - - - - - app - - - - - - - - 1.8 - - - - - - - - Spring|TestJPA - - - - - - - - 1.8 - - - - - - - - Maven: commons-logging:commons-logging:1.2 - - - - - - - - \ No newline at end of file diff --git a/JPA-Demo/pom.xml b/JPA-Demo/pom.xml index b436a4e..c9cbbc4 100644 --- a/JPA-Demo/pom.xml +++ b/JPA-Demo/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 cn.mrdear - jpa-demo + JPA-Demo war 1.0-SNAPSHOT JPA-Demo diff --git a/Jersey--Demo/.idea/artifacts/Jersey_war.xml b/Jersey--Demo/.idea/artifacts/Jersey_war.xml deleted file mode 100644 index c0768b5..0000000 --- a/Jersey--Demo/.idea/artifacts/Jersey_war.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - $PROJECT_DIR$/target - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/artifacts/Jersey_war_exploded.xml b/Jersey--Demo/.idea/artifacts/Jersey_war_exploded.xml deleted file mode 100644 index 96a9cc5..0000000 --- a/Jersey--Demo/.idea/artifacts/Jersey_war_exploded.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - $PROJECT_DIR$/target/mrdear - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/compiler.xml b/Jersey--Demo/.idea/compiler.xml deleted file mode 100644 index 7bb2917..0000000 --- a/Jersey--Demo/.idea/compiler.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/copyright/profiles_settings.xml b/Jersey--Demo/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/Jersey--Demo/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/encodings.xml b/Jersey--Demo/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/Jersey--Demo/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/Jersey--Demo/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml deleted file mode 100644 index 30ff5cb..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__cglib_cglib_3_2_2.xml b/Jersey--Demo/.idea/libraries/Maven__cglib_cglib_3_2_2.xml deleted file mode 100644 index 9e3d27a..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__cglib_cglib_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_18.xml b/Jersey--Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_18.xml deleted file mode 100644 index 2b9baaf..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_18.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml b/Jersey--Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml deleted file mode 100644 index 3888159..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_3_0.xml b/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_3_0.xml deleted file mode 100644 index e90bc9c..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_3_3.xml b/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_3_3.xml deleted file mode 100644 index 87b1692..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_3_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_3_3.xml b/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_3_3.xml deleted file mode 100644 index 4d18ceb..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_3_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_3_3.xml b/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_3_3.xml deleted file mode 100644 index 926c37b..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_3_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_3_3.xml b/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_3_3.xml deleted file mode 100644 index d8b05f2..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_3_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_3_3.xml b/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_3_3.xml deleted file mode 100644 index 8a8e4a2..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_3_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml b/Jersey--Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml deleted file mode 100644 index 01c7b8e..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml b/Jersey--Demo/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml deleted file mode 100644 index e35b936..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__javax_inject_javax_inject_1.xml b/Jersey--Demo/.idea/libraries/Maven__javax_inject_javax_inject_1.xml deleted file mode 100644 index 93cf65a..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__javax_inject_javax_inject_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml b/Jersey--Demo/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml deleted file mode 100644 index c24f7e3..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/Jersey--Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml deleted file mode 100644 index 940ce73..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/Jersey--Demo/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml deleted file mode 100644 index c890167..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__junit_junit_4_10.xml b/Jersey--Demo/.idea/libraries/Maven__junit_junit_4_10.xml deleted file mode 100644 index ed8bf5f..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__junit_junit_4_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__log4j_log4j_1_2_17.xml b/Jersey--Demo/.idea/libraries/Maven__log4j_log4j_1_2_17.xml deleted file mode 100644 index e383c1b..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__log4j_log4j_1_2_17.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml b/Jersey--Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml deleted file mode 100644 index 2b062b5..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml b/Jersey--Demo/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml deleted file mode 100644 index 8cba3e1..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml b/Jersey--Demo/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml deleted file mode 100644 index 4a5c8b2..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_6.xml b/Jersey--Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_6.xml deleted file mode 100644 index c62d9a0..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_aspectj_aspectjrt_1_8_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_6.xml b/Jersey--Demo/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_6.xml deleted file mode 100644 index 61938e1..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_antlr_2_5_0.xml b/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_antlr_2_5_0.xml deleted file mode 100644 index 81c15cb..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_antlr_2_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_asm_2_5_0.xml b/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_asm_2_5_0.xml deleted file mode 100644 index 153155e..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_asm_2_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_core_2_5_0.xml b/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_core_2_5_0.xml deleted file mode 100644 index a4277bc..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_core_2_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_moxy_2_5_0.xml b/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_moxy_2_5_0.xml deleted file mode 100644 index f567f2c..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_eclipse_persistence_org_eclipse_persistence_moxy_2_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_class_model_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_class_model_2_4_0_b09.xml deleted file mode 100644 index b09e817..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_class_model_2_4_0_b09.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_config_types_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_config_types_2_4_0_b09.xml deleted file mode 100644 index 4210c4f..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_config_types_2_4_0_b09.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_core_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_core_2_4_0_b09.xml deleted file mode 100644 index 8846537..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_core_2_4_0_b09.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b09.xml deleted file mode 100644 index c3efd2a..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b09.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_asm_all_repackaged_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_asm_all_repackaged_2_4_0_b09.xml deleted file mode 100644 index a5bf8d3..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_asm_all_repackaged_2_4_0_b09.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_bean_validator_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_bean_validator_2_4_0_b09.xml deleted file mode 100644 index 477880c..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_bean_validator_2_4_0_b09.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b09.xml deleted file mode 100644 index 2138707..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b09.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_2_4_0_b09.xml deleted file mode 100644 index fad414f..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_2_4_0_b09.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b09.xml deleted file mode 100644 index 6c41a8a..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b09.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_config_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_config_2_4_0_b09.xml deleted file mode 100644 index dfbf251..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_config_2_4_0_b09.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b09.xml deleted file mode 100644 index 7b0e1b5..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b09.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_runlevel_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_runlevel_2_4_0_b09.xml deleted file mode 100644 index d0ec802..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_runlevel_2_4_0_b09.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b09.xml deleted file mode 100644 index 7ec721b..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b09.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_osgi_resource_locator_1_0_1.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_osgi_resource_locator_1_0_1.xml deleted file mode 100644 index 3d299fa..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_osgi_resource_locator_1_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_spring_bridge_2_4_0_b09.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_spring_bridge_2_4_0_b09.xml deleted file mode 100644 index a6f4ab1..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_hk2_spring_bridge_2_4_0_b09.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_16.xml deleted file mode 100644 index 993c539..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_16.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_servlet_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_servlet_2_16.xml deleted file mode 100644 index 304d588..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_servlet_2_16.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_servlet_core_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_servlet_core_2_16.xml deleted file mode 100644 index 4c0edaa..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_servlet_core_2_16.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_16.xml deleted file mode 100644 index 1712979..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_16.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_16.xml deleted file mode 100644 index cd700e9..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_16.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_16.xml deleted file mode 100644 index 2a3b4b9..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_16.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_16.xml deleted file mode 100644 index fa44000..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_16.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_spring3_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_spring3_2_16.xml deleted file mode 100644 index e87be18..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_spring3_2_16.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_16.xml deleted file mode 100644 index 6ebbf60..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_16.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_moxy_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_moxy_2_16.xml deleted file mode 100644 index ddbe45c..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_moxy_2_16.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_multipart_2_16.xml b/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_multipart_2_16.xml deleted file mode 100644 index 4827c65..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_multipart_2_16.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/Jersey--Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml deleted file mode 100644 index acdf443..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml b/Jersey--Demo/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml deleted file mode 100644 index 1f90730..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_jvnet_mimepull_mimepull_1_9_3.xml b/Jersey--Demo/.idea/libraries/Maven__org_jvnet_mimepull_mimepull_1_9_3.xml deleted file mode 100644 index 5429fb6..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_jvnet_mimepull_mimepull_1_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_jvnet_tiger_types_1_4.xml b/Jersey--Demo/.idea/libraries/Maven__org_jvnet_tiger_types_1_4.xml deleted file mode 100644 index 8d7e1d6..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_jvnet_tiger_types_1_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_3_0.xml b/Jersey--Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_3_0.xml deleted file mode 100644 index 86720b3..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_2_3.xml b/Jersey--Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_2_3.xml deleted file mode 100644 index 8d9620c..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_2_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/Jersey--Demo/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml deleted file mode 100644 index 0bf8cf2..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/Jersey--Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml deleted file mode 100644 index 1e67260..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_7.xml b/Jersey--Demo/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_7.xml deleted file mode 100644 index 65d0ae6..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_1_1_RELEASE.xml deleted file mode 100644 index eade391..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_1_1_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_1_1_RELEASE.xml deleted file mode 100644 index 318e479..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_1_1_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_context_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_context_4_1_1_RELEASE.xml deleted file mode 100644 index f770b86..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_context_4_1_1_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_1_1_RELEASE.xml deleted file mode 100644 index ccead97..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_context_support_4_1_1_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_core_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_core_4_1_1_RELEASE.xml deleted file mode 100644 index 4a192e5..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_core_4_1_1_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_1_1_RELEASE.xml deleted file mode 100644 index fe9be52..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_1_1_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_1_1_RELEASE.xml deleted file mode 100644 index 95d8731..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_1_1_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_1_1_RELEASE.xml deleted file mode 100644 index a4c93d7..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_1_1_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_web_4_1_1_RELEASE.xml b/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_web_4_1_1_RELEASE.xml deleted file mode 100644 index 5c3f046..0000000 --- a/Jersey--Demo/.idea/libraries/Maven__org_springframework_spring_web_4_1_1_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/misc.xml b/Jersey--Demo/.idea/misc.xml deleted file mode 100644 index adfbe50..0000000 --- a/Jersey--Demo/.idea/misc.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/modules.xml b/Jersey--Demo/.idea/modules.xml deleted file mode 100644 index 84ac91e..0000000 --- a/Jersey--Demo/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/uiDesigner.xml b/Jersey--Demo/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/Jersey--Demo/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/.idea/workspace.xml b/Jersey--Demo/.idea/workspace.xml deleted file mode 100644 index 1c94010..0000000 --- a/Jersey--Demo/.idea/workspace.xml +++ /dev/null @@ -1,1685 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - project - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - C:\Users\牛李\AppData\Roaming\Subversion - - - - - 1469408303254 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Jersey工程:war - - - - - - - - Web - - - - - - - - - - - - - - - 1.8 - - - - - - - - Spring|Jersey工程 - - - - - - - - 1.8 - - - - - - - - Maven: javax.annotation:javax.annotation-api:1.2 - - - - - - - - \ No newline at end of file diff --git "a/Jersey--Demo/Jersey\345\267\245\347\250\213.iml" "b/Jersey--Demo/Jersey\345\267\245\347\250\213.iml" deleted file mode 100644 index 650de83..0000000 --- "a/Jersey--Demo/Jersey\345\267\245\347\250\213.iml" +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - file://$MODULE_DIR$/src/main/resources/applicationContext.xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Jersey--Demo/pom.xml b/Jersey-Demo/pom.xml similarity index 99% rename from Jersey--Demo/pom.xml rename to Jersey-Demo/pom.xml index 12785fd..774ec31 100644 --- a/Jersey--Demo/pom.xml +++ b/Jersey-Demo/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 cn.mrdear - jersey-demo + Jersey-Demo war 1.0-SNAPSHOT Jersey-Demo diff --git a/Jersey--Demo/src/main/java/com/haikong/ResultVO.java b/Jersey-Demo/src/main/java/com/haikong/ResultVO.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/ResultVO.java rename to Jersey-Demo/src/main/java/com/haikong/ResultVO.java diff --git a/Jersey--Demo/src/main/java/com/haikong/application/RESTApplication.java b/Jersey-Demo/src/main/java/com/haikong/application/RESTApplication.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/application/RESTApplication.java rename to Jersey-Demo/src/main/java/com/haikong/application/RESTApplication.java diff --git a/Jersey--Demo/src/main/java/com/haikong/dao/DeviceMapper.java b/Jersey-Demo/src/main/java/com/haikong/dao/DeviceMapper.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/dao/DeviceMapper.java rename to Jersey-Demo/src/main/java/com/haikong/dao/DeviceMapper.java diff --git a/Jersey--Demo/src/main/java/com/haikong/exception/DeviceExceptionMapper.java b/Jersey-Demo/src/main/java/com/haikong/exception/DeviceExceptionMapper.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/exception/DeviceExceptionMapper.java rename to Jersey-Demo/src/main/java/com/haikong/exception/DeviceExceptionMapper.java diff --git a/Jersey--Demo/src/main/java/com/haikong/exception/ErrorEntity.java b/Jersey-Demo/src/main/java/com/haikong/exception/ErrorEntity.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/exception/ErrorEntity.java rename to Jersey-Demo/src/main/java/com/haikong/exception/ErrorEntity.java diff --git a/Jersey--Demo/src/main/java/com/haikong/filter/PreRequestFilter.java b/Jersey-Demo/src/main/java/com/haikong/filter/PreRequestFilter.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/filter/PreRequestFilter.java rename to Jersey-Demo/src/main/java/com/haikong/filter/PreRequestFilter.java diff --git a/Jersey--Demo/src/main/java/com/haikong/filter/ResponseFilter.java b/Jersey-Demo/src/main/java/com/haikong/filter/ResponseFilter.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/filter/ResponseFilter.java rename to Jersey-Demo/src/main/java/com/haikong/filter/ResponseFilter.java diff --git a/Jersey--Demo/src/main/java/com/haikong/interceptor/GzipInterceptor.java b/Jersey-Demo/src/main/java/com/haikong/interceptor/GzipInterceptor.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/interceptor/GzipInterceptor.java rename to Jersey-Demo/src/main/java/com/haikong/interceptor/GzipInterceptor.java diff --git a/Jersey--Demo/src/main/java/com/haikong/model/Device.java b/Jersey-Demo/src/main/java/com/haikong/model/Device.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/model/Device.java rename to Jersey-Demo/src/main/java/com/haikong/model/Device.java diff --git a/Jersey--Demo/src/main/java/com/haikong/model/ReqDevice.java b/Jersey-Demo/src/main/java/com/haikong/model/ReqDevice.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/model/ReqDevice.java rename to Jersey-Demo/src/main/java/com/haikong/model/ReqDevice.java diff --git a/Jersey--Demo/src/main/java/com/haikong/model/ServicesBean.java b/Jersey-Demo/src/main/java/com/haikong/model/ServicesBean.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/model/ServicesBean.java rename to Jersey-Demo/src/main/java/com/haikong/model/ServicesBean.java diff --git a/Jersey--Demo/src/main/java/com/haikong/resources/DeviceController.java b/Jersey-Demo/src/main/java/com/haikong/resources/DeviceController.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/resources/DeviceController.java rename to Jersey-Demo/src/main/java/com/haikong/resources/DeviceController.java diff --git a/Jersey--Demo/src/main/java/com/haikong/service/DeviceService.java b/Jersey-Demo/src/main/java/com/haikong/service/DeviceService.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/service/DeviceService.java rename to Jersey-Demo/src/main/java/com/haikong/service/DeviceService.java diff --git a/Jersey--Demo/src/main/java/com/haikong/util/CheckUtil.java b/Jersey-Demo/src/main/java/com/haikong/util/CheckUtil.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/util/CheckUtil.java rename to Jersey-Demo/src/main/java/com/haikong/util/CheckUtil.java diff --git a/Jersey--Demo/src/main/java/com/haikong/util/Constants.java b/Jersey-Demo/src/main/java/com/haikong/util/Constants.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/util/Constants.java rename to Jersey-Demo/src/main/java/com/haikong/util/Constants.java diff --git a/Jersey--Demo/src/main/java/com/haikong/util/DecriptUtil.java b/Jersey-Demo/src/main/java/com/haikong/util/DecriptUtil.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/util/DecriptUtil.java rename to Jersey-Demo/src/main/java/com/haikong/util/DecriptUtil.java diff --git a/Jersey--Demo/src/main/java/com/haikong/util/DeviceUtil.java b/Jersey-Demo/src/main/java/com/haikong/util/DeviceUtil.java similarity index 100% rename from Jersey--Demo/src/main/java/com/haikong/util/DeviceUtil.java rename to Jersey-Demo/src/main/java/com/haikong/util/DeviceUtil.java diff --git a/Jersey--Demo/src/main/resources/applicationContext.xml b/Jersey-Demo/src/main/resources/applicationContext.xml similarity index 100% rename from Jersey--Demo/src/main/resources/applicationContext.xml rename to Jersey-Demo/src/main/resources/applicationContext.xml diff --git a/Jersey--Demo/src/main/resources/db.properties b/Jersey-Demo/src/main/resources/db.properties similarity index 100% rename from Jersey--Demo/src/main/resources/db.properties rename to Jersey-Demo/src/main/resources/db.properties diff --git a/Jersey--Demo/src/main/resources/db.sql b/Jersey-Demo/src/main/resources/db.sql similarity index 100% rename from Jersey--Demo/src/main/resources/db.sql rename to Jersey-Demo/src/main/resources/db.sql diff --git a/Jersey--Demo/src/main/resources/log4j.properties b/Jersey-Demo/src/main/resources/log4j.properties similarity index 100% rename from Jersey--Demo/src/main/resources/log4j.properties rename to Jersey-Demo/src/main/resources/log4j.properties diff --git a/Jersey--Demo/src/main/resources/mybatis/Mapper/DeviceMapper.xml b/Jersey-Demo/src/main/resources/mybatis/Mapper/DeviceMapper.xml similarity index 100% rename from Jersey--Demo/src/main/resources/mybatis/Mapper/DeviceMapper.xml rename to Jersey-Demo/src/main/resources/mybatis/Mapper/DeviceMapper.xml diff --git a/Jersey--Demo/src/main/resources/mybatis/SqlMapConfig.xml b/Jersey-Demo/src/main/resources/mybatis/SqlMapConfig.xml similarity index 100% rename from Jersey--Demo/src/main/resources/mybatis/SqlMapConfig.xml rename to Jersey-Demo/src/main/resources/mybatis/SqlMapConfig.xml diff --git a/Jersey--Demo/src/main/webapp/WEB-INF/web.xml b/Jersey-Demo/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from Jersey--Demo/src/main/webapp/WEB-INF/web.xml rename to Jersey-Demo/src/main/webapp/WEB-INF/web.xml diff --git a/Jersey--Demo/src/main/webapp/index.jsp b/Jersey-Demo/src/main/webapp/index.jsp similarity index 100% rename from Jersey--Demo/src/main/webapp/index.jsp rename to Jersey-Demo/src/main/webapp/index.jsp diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/doc/README.MD" b/Maven-Demo/doc/README.MD similarity index 100% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/doc/README.MD" rename to Maven-Demo/doc/README.MD diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/pom.xml" b/Maven-Demo/haikong-common/pom.xml similarity index 100% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/pom.xml" rename to Maven-Demo/haikong-common/pom.xml diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/src/main/java/com/haikong/common/entity/User.java" b/Maven-Demo/haikong-common/src/main/java/com/haikong/common/entity/User.java similarity index 100% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/src/main/java/com/haikong/common/entity/User.java" rename to Maven-Demo/haikong-common/src/main/java/com/haikong/common/entity/User.java diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/src/main/java/com/haikong/common/mapper/UserMapper.java" b/Maven-Demo/haikong-common/src/main/java/com/haikong/common/mapper/UserMapper.java similarity index 100% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/src/main/java/com/haikong/common/mapper/UserMapper.java" rename to Maven-Demo/haikong-common/src/main/java/com/haikong/common/mapper/UserMapper.java diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/src/main/resources/mybatis/mapper/userMapper.xml" b/Maven-Demo/haikong-common/src/main/resources/mybatis/mapper/userMapper.xml similarity index 100% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-common/src/main/resources/mybatis/mapper/userMapper.xml" rename to Maven-Demo/haikong-common/src/main/resources/mybatis/mapper/userMapper.xml diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/pom.xml" b/Maven-Demo/haikong-core/pom.xml similarity index 97% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/pom.xml" rename to Maven-Demo/haikong-core/pom.xml index 65035d3..ebefddc 100644 --- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/pom.xml" +++ b/Maven-Demo/haikong-core/pom.xml @@ -7,7 +7,7 @@ 1.0.0 4.0.0 - core + haikong-core war haikong-core http://maven.apache.org diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/java/com/haikong/core/controller/indexController.java" b/Maven-Demo/haikong-core/src/main/java/com/haikong/core/controller/indexController.java similarity index 100% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/java/com/haikong/core/controller/indexController.java" rename to Maven-Demo/haikong-core/src/main/java/com/haikong/core/controller/indexController.java diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/config.properties" b/Maven-Demo/haikong-core/src/main/resources/config.properties similarity index 100% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/config.properties" rename to Maven-Demo/haikong-core/src/main/resources/config.properties diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/db.properties" b/Maven-Demo/haikong-core/src/main/resources/db.properties similarity index 100% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/db.properties" rename to Maven-Demo/haikong-core/src/main/resources/db.properties diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/log4j.properties" b/Maven-Demo/haikong-core/src/main/resources/log4j.properties similarity index 100% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/log4j.properties" rename to Maven-Demo/haikong-core/src/main/resources/log4j.properties diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/mybatis/SqlMapConfig.xml" b/Maven-Demo/haikong-core/src/main/resources/mybatis/SqlMapConfig.xml similarity index 100% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/mybatis/SqlMapConfig.xml" rename to Maven-Demo/haikong-core/src/main/resources/mybatis/SqlMapConfig.xml diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/mybatis/mapper/2.txt" b/Maven-Demo/haikong-core/src/main/resources/mybatis/mapper/2.txt similarity index 100% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/mybatis/mapper/2.txt" rename to Maven-Demo/haikong-core/src/main/resources/mybatis/mapper/2.txt diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/spring/applicationContext.xml" b/Maven-Demo/haikong-core/src/main/resources/spring/applicationContext.xml similarity index 100% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/spring/applicationContext.xml" rename to Maven-Demo/haikong-core/src/main/resources/spring/applicationContext.xml diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/spring/dispatcher-servlet.xml" b/Maven-Demo/haikong-core/src/main/resources/spring/dispatcher-servlet.xml similarity index 94% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/spring/dispatcher-servlet.xml" rename to Maven-Demo/haikong-core/src/main/resources/spring/dispatcher-servlet.xml index 3db2ecd..7a8b34b 100644 --- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/resources/spring/dispatcher-servlet.xml" +++ b/Maven-Demo/haikong-core/src/main/resources/spring/dispatcher-servlet.xml @@ -1,11 +1,11 @@ - +

diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/webapp/WEB-INF/web.xml" b/Maven-Demo/haikong-core/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/webapp/WEB-INF/web.xml" rename to Maven-Demo/haikong-core/src/main/webapp/WEB-INF/web.xml diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/webapp/index.jsp" b/Maven-Demo/haikong-core/src/main/webapp/index.jsp similarity index 100% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-core/src/main/webapp/index.jsp" rename to Maven-Demo/haikong-core/src/main/webapp/index.jsp diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-switch/pom.xml" b/Maven-Demo/haikong-switch/pom.xml similarity index 100% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/haikong-switch/pom.xml" rename to Maven-Demo/haikong-switch/pom.xml diff --git "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/pom.xml" b/Maven-Demo/pom.xml similarity index 99% rename from "maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/pom.xml" rename to Maven-Demo/pom.xml index 82a4f01..f67ce3c 100644 --- "a/maven\345\244\232\346\250\241\345\235\227\351\241\271\347\233\256/pom.xml" +++ b/Maven-Demo/pom.xml @@ -5,9 +5,10 @@ 4.0.0 com.haikong - haikong + Maven-Demo pom 1.0.0 + Maven-demo haikong-core haikong-switch diff --git a/Motan-Demo/Service-Client/pom.xml b/Motan-Demo/Service-Client/pom.xml new file mode 100644 index 0000000..8d2eade --- /dev/null +++ b/Motan-Demo/Service-Client/pom.xml @@ -0,0 +1,16 @@ + + + + Motan-Demo + cn.mrdear.motan + 1.0-SNAPSHOT + + 4.0.0 + + cn.mrdear.motan + Service-Client + + + \ No newline at end of file diff --git a/Motan-Demo/Service-Client/src/main/java/cn/mrdear/client/dto/UserDTO.java b/Motan-Demo/Service-Client/src/main/java/cn/mrdear/client/dto/UserDTO.java new file mode 100644 index 0000000..72dd1ce --- /dev/null +++ b/Motan-Demo/Service-Client/src/main/java/cn/mrdear/client/dto/UserDTO.java @@ -0,0 +1,31 @@ +package cn.mrdear.client.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 用户DTO,用于Service层传输 + * @author Niu Li + * @since 2017/6/12 + */ +@Data +public class UserDTO implements Serializable{ + + private static final long serialVersionUID = 4086492518942464226L; + + private Long id; + + private String username; + + private String password; + + private Integer age; + + private String nickname; + + private String mail; + + private String memo; + +} diff --git a/Motan-Demo/Service-Client/src/main/java/cn/mrdear/client/service/IUserService.java b/Motan-Demo/Service-Client/src/main/java/cn/mrdear/client/service/IUserService.java new file mode 100644 index 0000000..1edd92f --- /dev/null +++ b/Motan-Demo/Service-Client/src/main/java/cn/mrdear/client/service/IUserService.java @@ -0,0 +1,37 @@ +package cn.mrdear.client.service; + +import cn.mrdear.client.dto.UserDTO; + +import java.util.Collection; +import java.util.List; + +/** + * 用户服务,一般都会在返回层再包裹一层,这里简而化之 + * @author Niu Li + * @since 2017/6/12 + */ +public interface IUserService { + + /** + * 根据id查找 + */ + UserDTO findById(Long id); + + /** + * 根据id批量查询 + */ + List queryByIds(Collection ids); + + /** + * 更新用户 + * @return 返回更新后的实体 + */ + UserDTO updateById(UserDTO userDTO); + + /** + * 根据id删除用户 + */ + Boolean deleteById(Long id); + + +} diff --git a/Motan-Demo/Service-Consumer/pom.xml b/Motan-Demo/Service-Consumer/pom.xml new file mode 100644 index 0000000..31ec032 --- /dev/null +++ b/Motan-Demo/Service-Consumer/pom.xml @@ -0,0 +1,108 @@ + + + + Motan-Demo + cn.mrdear.motan + 1.0-SNAPSHOT + + 4.0.0 + + cn.mrdear.motan + Service-Consumer + + + + cn.mrdear.motan + Service-Client + 1.0-SNAPSHOT + + + + com.weibo + motan-core + RELEASE + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + com.weibo + motan-transport-netty + RELEASE + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + com.weibo + motan-registry-zookeeper + RELEASE + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + com.101tec + zkclient + + + + + com.101tec + zkclient + 0.10 + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + com.weibo + motan-springsupport + RELEASE + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + org.springframework + spring-context + 4.3.6.RELEASE + + + + \ No newline at end of file diff --git a/Motan-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/ApplicationStart.java b/Motan-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/ApplicationStart.java new file mode 100644 index 0000000..f5e634b --- /dev/null +++ b/Motan-Demo/Service-Consumer/src/main/java/cn/mrdear/consumer/ApplicationStart.java @@ -0,0 +1,21 @@ +package cn.mrdear.consumer; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import cn.mrdear.client.service.IUserService; + +/** + * @author Niu Li + * @since 2017/6/14 + */ +public class ApplicationStart { + + public static void main(String[] args) throws InterruptedException { + ApplicationContext ctx = new ClassPathXmlApplicationContext( + "classpath:applicationContext.xml"); + IUserService service = (IUserService) ctx.getBean("userService"); + System.out.println(service.findById(1L)); + } + +} diff --git a/Motan-Demo/Service-Consumer/src/main/resources/applicationContext.xml b/Motan-Demo/Service-Consumer/src/main/resources/applicationContext.xml new file mode 100644 index 0000000..28b860c --- /dev/null +++ b/Motan-Demo/Service-Consumer/src/main/resources/applicationContext.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Motan-Demo/Service-Consumer/src/main/resources/logback.xml b/Motan-Demo/Service-Consumer/src/main/resources/logback.xml new file mode 100644 index 0000000..d68cd15 --- /dev/null +++ b/Motan-Demo/Service-Consumer/src/main/resources/logback.xml @@ -0,0 +1,19 @@ + + + + + + + + %d{HH:mm:ss} [%t] %logger{5} [%line] %p - %msg%n + + + + + + + + + + + \ No newline at end of file diff --git a/Motan-Demo/Service-Provider/pom.xml b/Motan-Demo/Service-Provider/pom.xml new file mode 100644 index 0000000..d5a727e --- /dev/null +++ b/Motan-Demo/Service-Provider/pom.xml @@ -0,0 +1,151 @@ + + + + Motan-Demo + cn.mrdear.motan + 1.0-SNAPSHOT + + 4.0.0 + + cn.mrdear.motan + Service-Provider + + + + + cn.mrdear.motan + Service-Client + 1.0-SNAPSHOT + + + + com.weibo + motan-core + RELEASE + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + com.weibo + motan-transport-netty + RELEASE + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + com.weibo + motan-registry-zookeeper + RELEASE + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + com.101tec + zkclient + + + + + com.101tec + zkclient + 0.10 + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + + com.weibo + motan-springsupport + RELEASE + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + org.springframework + spring-context + 4.3.6.RELEASE + + + org.springframework.data + spring-data-jpa + 1.10.4.RELEASE + + + + org.hibernate + hibernate-core + 5.1.0.Final + + + org.hibernate + hibernate-entitymanager + 5.1.0.Final + + + + + org.aspectj + aspectjweaver + 1.8.6 + + + org.aspectj + aspectjrt + 1.8.6 + + + + + cglib + cglib + 3.2.2 + + + + com.h2database + h2 + 1.4.187 + + + + \ No newline at end of file diff --git a/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/ApplicationStart.java b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/ApplicationStart.java new file mode 100644 index 0000000..7db2920 --- /dev/null +++ b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/ApplicationStart.java @@ -0,0 +1,22 @@ +package cn.mrdear.provider; + +import com.weibo.api.motan.common.MotanConstants; +import com.weibo.api.motan.util.MotanSwitcherUtil; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +/** + * @author Niu Li + * @since 2017/6/14 + */ +public class ApplicationStart { + + public static void main(String[] args) throws InterruptedException { + ApplicationContext applicationContext = + new ClassPathXmlApplicationContext("classpath:applicationContext.xml"); + MotanSwitcherUtil.setSwitcherValue(MotanConstants.REGISTRY_HEARTBEAT_SWITCHER, true); + System.out.println("server start..."); + } + +} diff --git a/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/convert/UserConvert.java b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/convert/UserConvert.java new file mode 100644 index 0000000..67ae9ca --- /dev/null +++ b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/convert/UserConvert.java @@ -0,0 +1,42 @@ +package cn.mrdear.provider.convert; + +import org.springframework.beans.BeanUtils; +import org.springframework.util.CollectionUtils; + +import cn.mrdear.client.dto.UserDTO; +import cn.mrdear.provider.domain.User; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author Niu Li + * @since 2017/6/12 + */ +public class UserConvert { + + public static UserDTO toDTO(User user) { + UserDTO userDTO = new UserDTO(); + BeanUtils.copyProperties(user,userDTO); + return userDTO; + } + + + public static List toDTOS(List users) { + if (CollectionUtils.isEmpty(users)) { + return new ArrayList<>(1); + } + List results = new ArrayList<>(); + return users.stream().map(UserConvert::toDTO) + .collect(Collectors.toList()); + } + + + public static User toDO(UserDTO userDTO) { + User user = new User(); + BeanUtils.copyProperties(userDTO,user); + return user; + } + +} diff --git a/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/dao/UserRepository.java b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/dao/UserRepository.java new file mode 100644 index 0000000..6b068b4 --- /dev/null +++ b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/dao/UserRepository.java @@ -0,0 +1,24 @@ +package cn.mrdear.provider.dao; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import cn.mrdear.provider.domain.User; + +import java.util.Collection; +import java.util.List; + +/** + * JPA repo层 + * @author Niu Li + * @since 2017/6/12 + */ +public interface UserRepository extends JpaRepository{ + + User findById(Long id); + + @Query("select p from User p where id in (?1)") + List queryByIds(Collection ids); + + +} diff --git a/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/domain/User.java b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/domain/User.java new file mode 100644 index 0000000..81849e5 --- /dev/null +++ b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/domain/User.java @@ -0,0 +1,39 @@ +package cn.mrdear.provider.domain; + +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; + +import java.io.Serializable; + +/** + * 用户实体类,对应数据库 + * @author Niu Li + * @since 2017/6/12 + */ +@Data +@Entity +@Table(name = "user") +public class User implements Serializable{ + + private static final long serialVersionUID = 1793488098966504793L; + @Id + @GeneratedValue + private Long id; + + private String username; + + private String password; + + private Integer age; + + private String nickname; + + private String mail; + + private String memo; + +} diff --git a/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/service/UserServiceImpl.java b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/service/UserServiceImpl.java new file mode 100644 index 0000000..7ab049a --- /dev/null +++ b/Motan-Demo/Service-Provider/src/main/java/cn/mrdear/provider/service/UserServiceImpl.java @@ -0,0 +1,46 @@ +package cn.mrdear.provider.service; + +import cn.mrdear.client.dto.UserDTO; +import cn.mrdear.client.service.IUserService; +import cn.mrdear.provider.convert.UserConvert; +import cn.mrdear.provider.dao.UserRepository; +import cn.mrdear.provider.domain.User; + +import javax.annotation.Resource; + +import java.util.Collection; +import java.util.List; + +/** + * @author Niu Li + * @since 2017/6/14 + */ +public class UserServiceImpl implements IUserService{ + @Resource + private UserRepository userRepository; + + @Override + public UserDTO findById(Long id) { + User user = userRepository.findById(id); + return UserConvert.toDTO(user); + } + + @Override + public List queryByIds(Collection ids) { + List users = userRepository.queryByIds(ids); + return UserConvert.toDTOS(users); + } + + @Override + public UserDTO updateById(UserDTO userDTO) { + User user = UserConvert.toDO(userDTO); + userRepository.save(user); + return this.findById(userDTO.getId()); + } + + @Override + public Boolean deleteById(Long id) { + userRepository.delete(id); + return true; + } +} diff --git a/Motan-Demo/Service-Provider/src/main/resources/applicationContext.xml b/Motan-Demo/Service-Provider/src/main/resources/applicationContext.xml new file mode 100644 index 0000000..4b5d788 --- /dev/null +++ b/Motan-Demo/Service-Provider/src/main/resources/applicationContext.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.hibernate.dialect.MySQL5Dialect + + false + + false + + false + + none + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Motan-Demo/Service-Provider/src/main/resources/h2/data.sql b/Motan-Demo/Service-Provider/src/main/resources/h2/data.sql new file mode 100644 index 0000000..a09f7a8 --- /dev/null +++ b/Motan-Demo/Service-Provider/src/main/resources/h2/data.sql @@ -0,0 +1,6 @@ +INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('zhangsan', + '123456', 18, '张三', '1111@qq.com', 'hahahah'); +INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('lis', +'123456', 19, '李四', '123131@qq.com', 'xixiixxi'); +INSERT INTO user (username, password, age, nickname, mail, memo) VALUES ('wanger', +'123456', 29, '王二', '12131984@qq.com', 'dqdh'); \ No newline at end of file diff --git a/Motan-Demo/Service-Provider/src/main/resources/h2/schema.sql b/Motan-Demo/Service-Provider/src/main/resources/h2/schema.sql new file mode 100644 index 0000000..8de82c2 --- /dev/null +++ b/Motan-Demo/Service-Provider/src/main/resources/h2/schema.sql @@ -0,0 +1,10 @@ +DROP TABLE user if exist; +create table user ( + id INT(11) AUTO_INCREMENT PRIMARY KEY , + username VARCHAR(255), + password VARCHAR(255), + age INT(3), + nickname VARCHAR(255), + mail VARCHAR(255), + memo VARCHAR(255), + ); \ No newline at end of file diff --git a/Motan-Demo/Service-Provider/src/main/resources/logback.xml b/Motan-Demo/Service-Provider/src/main/resources/logback.xml new file mode 100644 index 0000000..d68cd15 --- /dev/null +++ b/Motan-Demo/Service-Provider/src/main/resources/logback.xml @@ -0,0 +1,19 @@ + + + + + + + + %d{HH:mm:ss} [%t] %logger{5} [%line] %p - %msg%n + + + + + + + + + + + \ No newline at end of file diff --git a/Motan-Demo/pom.xml b/Motan-Demo/pom.xml new file mode 100644 index 0000000..eb68369 --- /dev/null +++ b/Motan-Demo/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + pom + + + Service-Client + Service-Provider + Service-Consumer + + + cn.mrdear.motan + Motan-Demo + 1.0-SNAPSHOT + + + + + org.projectlombok + lombok + 1.16.14 + + + junit + junit + 4.12 + + + com.google.guava + guava + 21.0 + + + + org.slf4j + slf4j-api + 1.7.7 + + + org.slf4j + jcl-over-slf4j + 1.7.7 + + + ch.qos.logback + logback-core + 1.1.2 + + + org.logback-extensions + logback-ext-spring + 0.1.4 + + + ch.qos.logback + logback-classic + 1.1.2 + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + UTF-8 + + + + + + \ No newline at end of file diff --git a/Pay-Demo/.idea/compiler.xml b/Pay-Demo/.idea/compiler.xml deleted file mode 100644 index 4dbd659..0000000 --- a/Pay-Demo/.idea/compiler.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/copyright/profiles_settings.xml b/Pay-Demo/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/Pay-Demo/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/deployment.xml b/Pay-Demo/.idea/deployment.xml deleted file mode 100644 index 25a0408..0000000 --- a/Pay-Demo/.idea/deployment.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/encodings.xml b/Pay-Demo/.idea/encodings.xml deleted file mode 100644 index c0bce70..0000000 --- a/Pay-Demo/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/Pay-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml deleted file mode 100644 index a8b0d9c..0000000 --- a/Pay-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/Pay-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml deleted file mode 100644 index 1c76d0b..0000000 --- a/Pay-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml b/Pay-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml deleted file mode 100644 index 3888159..0000000 --- a/Pay-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml b/Pay-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml deleted file mode 100644 index 27424a1..0000000 --- a/Pay-Demo/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/Pay-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml deleted file mode 100644 index eab40b3..0000000 --- a/Pay-Demo/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/libraries/Maven__junit_junit_4_10.xml b/Pay-Demo/.idea/libraries/Maven__junit_junit_4_10.xml deleted file mode 100644 index ed8bf5f..0000000 --- a/Pay-Demo/.idea/libraries/Maven__junit_junit_4_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/Pay-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml deleted file mode 100644 index 83cba3e..0000000 --- a/Pay-Demo/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_5.xml b/Pay-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_5.xml deleted file mode 100644 index 5601459..0000000 --- a/Pay-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_2.xml b/Pay-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_2.xml deleted file mode 100644 index 1c14963..0000000 --- a/Pay-Demo/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_51.xml b/Pay-Demo/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_51.xml deleted file mode 100644 index e98695e..0000000 --- a/Pay-Demo/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_51.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/Pay-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml deleted file mode 100644 index acdf443..0000000 --- a/Pay-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/Pay-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml deleted file mode 100644 index 282edcb..0000000 --- a/Pay-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/Pay-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml deleted file mode 100644 index 1e67260..0000000 --- a/Pay-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/libraries/alipay_sdk_java20161029120104.xml b/Pay-Demo/.idea/libraries/alipay_sdk_java20161029120104.xml deleted file mode 100644 index 106ac78..0000000 --- a/Pay-Demo/.idea/libraries/alipay_sdk_java20161029120104.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/misc.xml b/Pay-Demo/.idea/misc.xml deleted file mode 100644 index 3be9714..0000000 --- a/Pay-Demo/.idea/misc.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - C:\Users\NL\AppData\Roaming\Subversion - - \ No newline at end of file diff --git a/Pay-Demo/.idea/modules.xml b/Pay-Demo/.idea/modules.xml deleted file mode 100644 index 923c63e..0000000 --- a/Pay-Demo/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/uiDesigner.xml b/Pay-Demo/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/Pay-Demo/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/.idea/workspace.xml b/Pay-Demo/.idea/workspace.xml deleted file mode 100644 index b69c385..0000000 --- a/Pay-Demo/.idea/workspace.xml +++ /dev/null @@ -1,1701 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Java - - - Java language level migration aidsJava - - - - - Since15 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - project - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1477710230969 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No facets are configured - - - - - - - - app - - - - - - - - 1.8 - - - - - - - - CommonPay - - - - - - - - 1.8 - - - - - - - - alipay-sdk-java20161029120104 - - - - - - - - \ No newline at end of file diff --git a/Pay-Demo/pom.xml b/Pay-Demo/pom.xml index 24cee51..c87d8e1 100644 --- a/Pay-Demo/pom.xml +++ b/Pay-Demo/pom.xml @@ -3,11 +3,11 @@ 4.0.0 cn.mrdear - commonpay + Pay-Demo 1.0.0 jar - pay-demo + Pay-demo http://maven.apache.org diff --git a/README.MD b/README.MD index 348163f..5ab30da 100644 --- a/README.MD +++ b/README.MD @@ -1,3 +1,7 @@ +### 2017.9.27 +随着开发经验的增加,现在觉得这种Demo对于学习一个框架起不到太大的作用,顶多是个参考,并且由于使用经验的增加,对于之前一些错误的用法很难得到纠正,如果想要快速入门的话官方+造轮子才是最佳选择,类似豆瓣有许多开放的API,都可以用来练手,最后该项目不再更新,这点经验希望能帮助你. + + #该仓库主要记录学习javaWEB中一些Demo 1.SSM-Demo @@ -18,11 +22,11 @@ -------------- 该Demo是做学习Spring-Boot时整合环境,整合了thymeleaf,Mybatis,Druid,ehcache可以拉下来直接进行二次开发,如果是WebService服务的话,去掉thymeleaf即可. -4.maven多模块项目 +4.Maven-Demo -------------- 该demo针对具体项目所整合.主要设计mybatis多模块使用,spring多模块使用,要点就是无论什么模块,只要配置文件加载位置正确配置,就不会出问题. -5.HtmlUnit-Demo +5.HtmlUnit-Demo -------------- 使用htmlUnit模拟浏览器请求,抓取Shadowsocks的一些免费账户使用,在win下配合bat脚本启动,很是方便.详情可以看项目的Main方法使用说明. @@ -39,5 +43,33 @@ SpringDataJPA+QueryDSL使用,需要配合博客博文http://www.jianshu.com/p/e3 -------------- 开发中常用工具类的写法,比如PropertiesUtil,XmlUtil,HttpUtil等,该Demo希望大家能不断扩充. -9.待添加 +9.gRPC-Demo +-------------- +参考官方案例的gRPC的Demo,里面有Hello World和 RouteGuide案例,适合入门.相关博文参考 http://www.jianshu.com/nb/9491747 + +10.Excel-Demo +-------------- +使用Apache-poi封装的一个通用表单导出模块和解析模块,可以很容易的迁移到项目中,配合Jackxml使用更佳 + +11.Spring-Data-Redis +-------------- +SpringDataRedis学习的一个Demo,内容不多,配合博文:[redis学习记录(四)-SpringDataRedis分析](http://mrdear.cn/2017/03/29/linux/redis%E5%AD%A6%E4%B9%A0%E8%AE%B0%E5%BD%95(%E5%9B%9B)-SpringDataRedis%E5%88%86%E6%9E%90/)可以很好的入手 + +12.Spring-Cloud-Demo +-------------- +学习Spring Cloud的一个Demo,其中对于Eureka,Ribbon,Feign等都有相应的Demo,相应博文会更新在[我的博客](mrdear.cn)上,希望对你有帮助 + +13.Dubbo-Demo +-------------- +增加Dubbo-Demo,一个基本的RPC调用Demo + +14.Motan-Demo +-------------- +增加Motan-Demo,一个基本的RPC调用Demo + +15.Spring-Security-Demo +-------------- +增加Spring Security Demo,项目中使用了JWT Token验证机制,该项目可以很好的了解整个流程的作用,需要配合我博客中Spring Security相关博文食用. + +16.待添加 -------------- diff --git a/SSM--Demo/src/main/java/cn/mrdear/entity/Appointment.java b/SSM--Demo/src/main/java/cn/mrdear/entity/Appointment.java deleted file mode 100644 index 472d575..0000000 --- a/SSM--Demo/src/main/java/cn/mrdear/entity/Appointment.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.mrdear.entity; - -import java.util.Date; -import javax.persistence.*; - -@Table(name = "appointment") -public class Appointment extends AppointmentKey { - /** - * 预约时间 - */ - @Column(name = "appoint_time") - private Date appointTime; - - /** - * 获取预约时间 - * - * @return appoint_time - 预约时间 - */ - public Date getAppointTime() { - return appointTime; - } - - /** - * 设置预约时间 - * - * @param appointTime 预约时间 - */ - public void setAppointTime(Date appointTime) { - this.appointTime = appointTime; - } -} \ No newline at end of file diff --git a/SSM--Demo/src/main/java/cn/mrdear/entity/AppointmentKey.java b/SSM--Demo/src/main/java/cn/mrdear/entity/AppointmentKey.java deleted file mode 100644 index 38c621d..0000000 --- a/SSM--Demo/src/main/java/cn/mrdear/entity/AppointmentKey.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.mrdear.entity; - -import javax.persistence.*; - -@Table(name = "appointment") -public class AppointmentKey { - /** - * 图书ID - */ - @Id - @Column(name = "book_id") - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long bookId; - - /** - * 学号 - */ - @Id - @Column(name = "student_id") - private Long studentId; - - /** - * 获取图书ID - * - * @return book_id - 图书ID - */ - public Long getBookId() { - return bookId; - } - - /** - * 设置图书ID - * - * @param bookId 图书ID - */ - public void setBookId(Long bookId) { - this.bookId = bookId; - } - - /** - * 获取学号 - * - * @return student_id - 学号 - */ - public Long getStudentId() { - return studentId; - } - - /** - * 设置学号 - * - * @param studentId 学号 - */ - public void setStudentId(Long studentId) { - this.studentId = studentId; - } -} \ No newline at end of file diff --git a/SSM--Demo/src/main/java/cn/mrdear/mapper/AppointmentMapper.java b/SSM--Demo/src/main/java/cn/mrdear/mapper/AppointmentMapper.java deleted file mode 100644 index de7aad6..0000000 --- a/SSM--Demo/src/main/java/cn/mrdear/mapper/AppointmentMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.mrdear.mapper; - -import cn.mrdear.entity.Appointment; -import tk.mybatis.mapper.common.Mapper; - -public interface AppointmentMapper extends Mapper { - -} \ No newline at end of file diff --git a/SSM--Demo/src/main/resources/db.sql b/SSM--Demo/src/main/resources/db.sql deleted file mode 100644 index ceb725b..0000000 --- a/SSM--Demo/src/main/resources/db.sql +++ /dev/null @@ -1,58 +0,0 @@ -/* -SQLyog Ultimate v12.08 (64 bit) -MySQL - 5.6.24 : Database - ssm -********************************************************************* -*/ - - -/*!40101 SET NAMES utf8 */; - -/*!40101 SET SQL_MODE=''*/; - -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; -CREATE DATABASE /*!32312 IF NOT EXISTS*/`ssm` /*!40100 DEFAULT CHARACTER SET utf8 */; - -USE `ssm`; - -/*Table structure for table `appointment` */ - -CREATE TABLE `appointment` ( - `book_id` bigint(20) NOT NULL COMMENT '图书ID', - `student_id` bigint(20) NOT NULL COMMENT '学号', - `appoint_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '预约时间', - PRIMARY KEY (`book_id`,`student_id`), - KEY `idx_appoint_time` (`appoint_time`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='预约图书表'; - -/*Data for the table `appointment` */ - -LOCK TABLES `appointment` WRITE; - -insert into `appointment`(`book_id`,`student_id`,`appoint_time`) values (1000,12345678910,'2017-01-22 10:36:31'); - -UNLOCK TABLES; - -/*Table structure for table `book` */ - -CREATE TABLE `book` ( - `book_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '图书ID', - `name` varchar(100) NOT NULL COMMENT '图书名称', - `number` int(11) NOT NULL COMMENT '馆藏数量', - PRIMARY KEY (`book_id`) -) ENGINE=InnoDB AUTO_INCREMENT=1004 DEFAULT CHARSET=utf8 COMMENT='图书表'; - -/*Data for the table `book` */ - -LOCK TABLES `book` WRITE; - -insert into `book`(`book_id`,`name`,`number`) values (1000,'Java程序设计',10),(1001,'数据结构',10),(1002,'设计模式',10),(1003,'编译原理',10); - -UNLOCK TABLES; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; diff --git a/SSM--Demo/src/main/resources/mybatis/mapper/AppointmentMapper.xml b/SSM--Demo/src/main/resources/mybatis/mapper/AppointmentMapper.xml deleted file mode 100644 index 11bbe9b..0000000 --- a/SSM--Demo/src/main/resources/mybatis/mapper/AppointmentMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - book_id, student_id, appoint_time - - \ No newline at end of file diff --git a/SSM--Demo/doc/readme.md b/SSM-Demo/doc/readme.md similarity index 100% rename from SSM--Demo/doc/readme.md rename to SSM-Demo/doc/readme.md diff --git a/SSM--Demo/pom.xml b/SSM-Demo/pom.xml similarity index 96% rename from SSM--Demo/pom.xml rename to SSM-Demo/pom.xml index b790bb6..cb23e4b 100644 --- a/SSM--Demo/pom.xml +++ b/SSM-Demo/pom.xml @@ -186,6 +186,13 @@ jcl-over-slf4j ${slf4j.jcl.version} + + javax.servlet + jstl + 1.2 + runtime + + @@ -199,7 +206,7 @@ mybatis-generator-maven-plugin 1.3.2 - ../SSM--Demo/src/main/resources/ModelGenerator.xml + ../SSM-Demo/src/main/resources/ModelGenerator.xml true true diff --git a/SSM--Demo/src/main/java/cn/mrdear/controller/BookController.java b/SSM-Demo/src/main/java/cn/mrdear/controller/BookController.java similarity index 58% rename from SSM--Demo/src/main/java/cn/mrdear/controller/BookController.java rename to SSM-Demo/src/main/java/cn/mrdear/controller/BookController.java index e45d04c..e488320 100644 --- a/SSM--Demo/src/main/java/cn/mrdear/controller/BookController.java +++ b/SSM-Demo/src/main/java/cn/mrdear/controller/BookController.java @@ -1,7 +1,6 @@ package cn.mrdear.controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -13,17 +12,16 @@ /** * @author Niu Li - * @date 2016/9/22 + * @since 2016/9/22 */ @RestController public class BookController { + @Resource private BookService bookService; - @RequestMapping(value = "/books") - @ResponseBody + @GetMapping("/books") public List books(){ - List books = bookService.findAll(); - return books; + return bookService.findAll(); } } diff --git a/SSM-Demo/src/main/java/cn/mrdear/controller/ErrorController.java b/SSM-Demo/src/main/java/cn/mrdear/controller/ErrorController.java new file mode 100644 index 0000000..449c00d --- /dev/null +++ b/SSM-Demo/src/main/java/cn/mrdear/controller/ErrorController.java @@ -0,0 +1,17 @@ +package cn.mrdear.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * @author Niu Li + * @since 2017/4/19 + */ +@Controller +public class ErrorController { + + @GetMapping("/error") + public String error(){ + return "error"; + } +} diff --git a/SSM--Demo/src/main/java/cn/mrdear/entity/Book.java b/SSM-Demo/src/main/java/cn/mrdear/entity/Book.java similarity index 100% rename from SSM--Demo/src/main/java/cn/mrdear/entity/Book.java rename to SSM-Demo/src/main/java/cn/mrdear/entity/Book.java diff --git a/SSM-Demo/src/main/java/cn/mrdear/exception/GlobalException.java b/SSM-Demo/src/main/java/cn/mrdear/exception/GlobalException.java new file mode 100644 index 0000000..bec18d4 --- /dev/null +++ b/SSM-Demo/src/main/java/cn/mrdear/exception/GlobalException.java @@ -0,0 +1,78 @@ +package cn.mrdear.exception; + +import com.alibaba.fastjson.JSONObject; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * 全局异常配置 + * @author Niu Li + * @since 2017/4/19 + */ +@ControllerAdvice +public class GlobalException { + + private static Logger logger = LoggerFactory.getLogger(GlobalException.class); + /** + * 全局异常处理 + * + * @param request 请求 + * @param response 返回 + * @param ex 异常 + */ + @ExceptionHandler(value = Exception.class) + @ResponseStatus(HttpStatus.OK)//错误码可以自己定义 + @ResponseBody + public Object exceptionHandler(HttpServletRequest request, HttpServletResponse response, Exception ex) { + logger.error("ExceptionHander catch error: ", ex); + //判断是否为ajax请求 + String xRequested = request.getHeader("x-requested-with"); + if (StringUtils.equalsIgnoreCase(xRequested,"XMLHttpRequest")){ + return handlerAjax(ex); + } + + //重定向到错误页面,错误页面需要自己定义 + request.setAttribute("errorMessage",ex.getMessage()); + redirect("/error", HttpStatus.NOT_FOUND,request,response); + return null; + } + + /** + * 处理ajax异常 + * @param ex 异常 + * @return json异常信息 + */ + private JSONObject handlerAjax(Exception ex){ + JSONObject resultVO = new JSONObject(); + resultVO.put("status",0); + resultVO.put("msg",ex.getMessage()); + return resultVO; + } + + /** + * 重定向到错误页面 + * @param url 链接 + */ + private void redirect(String url,HttpStatus status,HttpServletRequest request, + HttpServletResponse response){ + try { + response.setStatus(status.value()); + request.getRequestDispatcher(url).forward(request,response); + } catch (IOException | ServletException e) { + logger.error("redirect fail,e:{}",e); + } + } +} diff --git a/SSM--Demo/src/main/java/cn/mrdear/mapper/BookMapper.java b/SSM-Demo/src/main/java/cn/mrdear/mapper/BookMapper.java similarity index 100% rename from SSM--Demo/src/main/java/cn/mrdear/mapper/BookMapper.java rename to SSM-Demo/src/main/java/cn/mrdear/mapper/BookMapper.java diff --git a/SSM--Demo/src/main/java/cn/mrdear/service/BookService.java b/SSM-Demo/src/main/java/cn/mrdear/service/BookService.java similarity index 88% rename from SSM--Demo/src/main/java/cn/mrdear/service/BookService.java rename to SSM-Demo/src/main/java/cn/mrdear/service/BookService.java index 913d5a3..ad31516 100644 --- a/SSM--Demo/src/main/java/cn/mrdear/service/BookService.java +++ b/SSM-Demo/src/main/java/cn/mrdear/service/BookService.java @@ -15,6 +15,5 @@ public interface BookService { * 查询所有的books * @return 结果集 */ - @Cacheable(cacheNames = "bookcache") List findAll(); } diff --git a/SSM--Demo/src/main/java/cn/mrdear/service/BookServiceImpl.java b/SSM-Demo/src/main/java/cn/mrdear/service/impl/BookServiceImpl.java similarity index 67% rename from SSM--Demo/src/main/java/cn/mrdear/service/BookServiceImpl.java rename to SSM-Demo/src/main/java/cn/mrdear/service/impl/BookServiceImpl.java index 825a4bd..c2dbca0 100644 --- a/SSM--Demo/src/main/java/cn/mrdear/service/BookServiceImpl.java +++ b/SSM-Demo/src/main/java/cn/mrdear/service/impl/BookServiceImpl.java @@ -1,5 +1,6 @@ -package cn.mrdear.service; +package cn.mrdear.service.impl; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import java.util.List; @@ -8,17 +9,20 @@ import cn.mrdear.entity.Book; import cn.mrdear.mapper.BookMapper; +import cn.mrdear.service.BookService; /** * @author Niu Li - * @date 2017/1/23 + * @since 2017/1/23 */ @Service -public class BookServiceImpl implements BookService{ +public class BookServiceImpl implements BookService { + @Resource private BookMapper bookMapper; @Override + @Cacheable(cacheNames = "bookcache") public List findAll() { List books = bookMapper.selectAll(); System.out.println("测试缓存,如果缓存开启,多次请求则该方法会执行一次"); diff --git a/SSM--Demo/src/main/resources/ModelGenerator.xml b/SSM-Demo/src/main/resources/ModelGenerator.xml similarity index 100% rename from SSM--Demo/src/main/resources/ModelGenerator.xml rename to SSM-Demo/src/main/resources/ModelGenerator.xml diff --git a/SSM-Demo/src/main/resources/db.properties b/SSM-Demo/src/main/resources/db.properties new file mode 100644 index 0000000..aa18d74 --- /dev/null +++ b/SSM-Demo/src/main/resources/db.properties @@ -0,0 +1,23 @@ +jdbc.driver=com.mysql.jdbc.Driver +jdbc.url=jdbc:mysql://115.159.185.14:3306/ssm?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 +jdbc.username=root +jdbc.password=7946521 + +filters:stat + +maxActive:20 +initialSize:1 +maxWait:60000 +minIdle:10 + +timeBetweenEvictionRunsMillis:60000 +minEvictableIdleTimeMillis:300000 + +testWhileIdle:true +testOnBorrow:false +testOnReturn:false + +maxOpenPreparedStatements:20 +removeAbandoned:true +removeAbandonedTimeout:1800 +logAbandoned:true diff --git a/SSM-Demo/src/main/resources/db.sql b/SSM-Demo/src/main/resources/db.sql new file mode 100644 index 0000000..bdc7459 --- /dev/null +++ b/SSM-Demo/src/main/resources/db.sql @@ -0,0 +1,31 @@ +/* +SQLyog Ultimate v12.08 (64 bit) +MySQL - 5.6.24 : Database - ssm +********************************************************************* +*/ + + +/*!40101 SET NAMES utf8 */; + +CREATE DATABASE /*!32312 IF NOT EXISTS*/`ssm` /*!40100 DEFAULT CHARACTER SET utf8 */; + +USE `ssm`; + + + +/*Table structure for table `book` */ + +CREATE TABLE `book` ( + `book_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '图书ID', + `name` varchar(100) NOT NULL COMMENT '图书名称', + `number` int(11) NOT NULL COMMENT '馆藏数量', + PRIMARY KEY (`book_id`) +) ENGINE=InnoDB AUTO_INCREMENT=1004 DEFAULT CHARSET=utf8 COMMENT='图书表'; + +/*Data for the table `book` */ + +LOCK TABLES `book` WRITE; + +insert into `book`(`book_id`,`name`,`number`) values (1000,'Java程序设计',10),(1001,'数据结构',10),(1002,'设计模式',10),(1003,'编译原理',10); + +UNLOCK TABLES; diff --git a/SSM--Demo/src/main/resources/ehcache.xml b/SSM-Demo/src/main/resources/ehcache.xml similarity index 100% rename from SSM--Demo/src/main/resources/ehcache.xml rename to SSM-Demo/src/main/resources/ehcache.xml diff --git a/SSM--Demo/src/main/resources/logback.xml b/SSM-Demo/src/main/resources/logback.xml similarity index 100% rename from SSM--Demo/src/main/resources/logback.xml rename to SSM-Demo/src/main/resources/logback.xml diff --git a/SSM--Demo/src/main/resources/mybatis/mapper/BookMapper.xml b/SSM-Demo/src/main/resources/mybatis/mapper/BookMapper.xml similarity index 90% rename from SSM--Demo/src/main/resources/mybatis/mapper/BookMapper.xml rename to SSM-Demo/src/main/resources/mybatis/mapper/BookMapper.xml index 4d971fa..745ae83 100644 --- a/SSM--Demo/src/main/resources/mybatis/mapper/BookMapper.xml +++ b/SSM-Demo/src/main/resources/mybatis/mapper/BookMapper.xml @@ -1,6 +1,6 @@ - + + + diff --git a/SSM--Demo/src/main/resources/spring/dispatcher-servlet.xml b/SSM-Demo/src/main/resources/spring/dispatcher-servlet.xml similarity index 90% rename from SSM--Demo/src/main/resources/spring/dispatcher-servlet.xml rename to SSM-Demo/src/main/resources/spring/dispatcher-servlet.xml index 347bad8..7fd3f3a 100644 --- a/SSM--Demo/src/main/resources/spring/dispatcher-servlet.xml +++ b/SSM-Demo/src/main/resources/spring/dispatcher-servlet.xml @@ -1,11 +1,11 @@ - +

@@ -48,7 +48,6 @@ - @@ -61,9 +60,6 @@ - - - +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + Title + + +

Error 页面

+ + diff --git a/SSM--Demo/src/main/webapp/WEB-INF/web.xml b/SSM-Demo/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from SSM--Demo/src/main/webapp/WEB-INF/web.xml rename to SSM-Demo/src/main/webapp/WEB-INF/web.xml diff --git a/SSM--Demo/src/main/webapp/index.jsp b/SSM-Demo/src/main/webapp/index.jsp similarity index 100% rename from SSM--Demo/src/main/webapp/index.jsp rename to SSM-Demo/src/main/webapp/index.jsp diff --git a/Spring-Boot-Demo/.idea/compiler.xml b/Spring-Boot-Demo/.idea/compiler.xml deleted file mode 100644 index ce4b38c..0000000 --- a/Spring-Boot-Demo/.idea/compiler.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/copyright/profiles_settings.xml b/Spring-Boot-Demo/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/Spring-Boot-Demo/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/encodings.xml b/Spring-Boot-Demo/.idea/encodings.xml deleted file mode 100644 index c0bce70..0000000 --- a/Spring-Boot-Demo/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/inspectionProfiles/Project_Default.xml b/Spring-Boot-Demo/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 8c9b405..0000000 --- a/Spring-Boot-Demo/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/inspectionProfiles/profiles_settings.xml b/Spring-Boot-Demo/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b31283..0000000 --- a/Spring-Boot-Demo/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml b/Spring-Boot-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml deleted file mode 100644 index cdd7959..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml b/Spring-Boot-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml deleted file mode 100644 index 6c2a760..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_19.xml b/Spring-Boot-Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_19.xml deleted file mode 100644 index 4a7f94b..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__com_alibaba_druid_1_0_19.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml b/Spring-Boot-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml deleted file mode 100644 index 3888159..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__com_alibaba_fastjson_1_2_14.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_classmate_1_3_1.xml b/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_classmate_1_3_1.xml deleted file mode 100644 index cfcab12..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_classmate_1_3_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_1.xml b/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_1.xml deleted file mode 100644 index 1a718d6..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_1.xml b/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_1.xml deleted file mode 100644 index 89164c5..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_1.xml b/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_1.xml deleted file mode 100644 index 6307d67..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_4.xml b/Spring-Boot-Demo/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_4.xml deleted file mode 100644 index 01dedb4..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_3.xml b/Spring-Boot-Demo/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_3.xml deleted file mode 100644 index cd0a66a..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/Spring-Boot-Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml deleted file mode 100644 index 940ce73..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__junit_junit_4_10.xml b/Spring-Boot-Demo/.idea/libraries/Maven__junit_junit_4_10.xml deleted file mode 100644 index ed8bf5f..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__junit_junit_4_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_34.xml b/Spring-Boot-Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_34.xml deleted file mode 100644 index b984e59..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_34.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_2_10_2_2_21.xml b/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_2_10_2_2_21.xml deleted file mode 100644 index b777b97..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_2_10_2_2_21.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_8.xml b/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_8.xml deleted file mode 100644 index 3515cd5..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_web_2_0_4.xml b/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_web_2_0_4.xml deleted file mode 100644 index e41e7ba..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__net_sf_ehcache_ehcache_web_2_0_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__nz_net_ultraq_thymeleaf_thymeleaf_layout_dialect_1_4_0.xml b/Spring-Boot-Demo/.idea/libraries/Maven__nz_net_ultraq_thymeleaf_thymeleaf_layout_dialect_1_4_0.xml deleted file mode 100644 index 537b4b1..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__nz_net_ultraq_thymeleaf_thymeleaf_layout_dialect_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__ognl_ognl_3_0_8.xml b/Spring-Boot-Demo/.idea/libraries/Maven__ognl_ognl_3_0_8.xml deleted file mode 100644 index 1a94644..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__ognl_ognl_3_0_8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_4.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_4.xml deleted file mode 100644 index 09827ab..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_4.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_4.xml deleted file mode 100644 index 588a181..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_4.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_4.xml deleted file mode 100644 index 9962a4b..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_4.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_4.xml deleted file mode 100644 index 637262e..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_4.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_4.xml deleted file mode 100644 index 45edb2d..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_4_7.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_4_7.xml deleted file mode 100644 index 8c0eabe..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_4_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml deleted file mode 100644 index f58bbc1..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml deleted file mode 100644 index 6c5e17f..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml deleted file mode 100644 index c21c9b0..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml deleted file mode 100644 index 186d87f..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_caches_mybatis_ehcache_1_0_3.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_caches_mybatis_ehcache_1_0_3.xml deleted file mode 100644 index 31ffbe4..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_caches_mybatis_ehcache_1_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_4_0.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_4_0.xml deleted file mode 100644 index 655ae2e..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_mybatis_3_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml deleted file mode 100644 index bd108d5..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml deleted file mode 100644 index 218b48a..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.xml deleted file mode 100644 index 77694f1..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml deleted file mode 100644 index 2f93a63..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_21.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_21.xml deleted file mode 100644 index dd05efc..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_21.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_21.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_21.xml deleted file mode 100644 index 0f9744a..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_21.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml deleted file mode 100644 index 1b644dd..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_4_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_4_0_RELEASE.xml deleted file mode 100644 index a193527..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_4_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_4_0_RELEASE.xml deleted file mode 100644 index d24946a..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_4_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_4_0_RELEASE.xml deleted file mode 100644 index 07ae94e..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_4_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_4_0_RELEASE.xml deleted file mode 100644 index 59f1e83..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_4_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_4_0_RELEASE.xml deleted file mode 100644 index f965e34..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_1_4_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_1_4_0_RELEASE.xml deleted file mode 100644 index c275816..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_4_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_4_0_RELEASE.xml deleted file mode 100644 index 2f661ba..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_4_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_4_0_RELEASE.xml deleted file mode 100644 index e2e3a71..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_4_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_3_2_RELEASE.xml deleted file mode 100644 index 4508a6b..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_aop_4_3_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_3_2_RELEASE.xml deleted file mode 100644 index d650bb8..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_beans_4_3_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_context_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_context_4_3_2_RELEASE.xml deleted file mode 100644 index b497541..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_context_4_3_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_core_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_core_4_3_2_RELEASE.xml deleted file mode 100644 index aca549b..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_core_4_3_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_3_2_RELEASE.xml deleted file mode 100644 index e802cd8..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_expression_4_3_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_2_RELEASE.xml deleted file mode 100644 index 7b6a300..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_3_2_RELEASE.xml deleted file mode 100644 index 0254b40..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_tx_4_3_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_web_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_web_4_3_2_RELEASE.xml deleted file mode 100644 index 2b7b1d4..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_web_4_3_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_2_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_2_RELEASE.xml deleted file mode 100644 index e4b70bb..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_thymeleaf_thymeleaf_2_1_5_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_thymeleaf_thymeleaf_2_1_5_RELEASE.xml deleted file mode 100644 index 3905ea7..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_thymeleaf_thymeleaf_2_1_5_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring4_2_1_5_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring4_2_1_5_RELEASE.xml deleted file mode 100644 index 9cba1c2..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring4_2_1_5_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_unbescape_unbescape_1_1_0_RELEASE.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_unbescape_unbescape_1_1_0_RELEASE.xml deleted file mode 100644 index c05f04a..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_unbescape_unbescape_1_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml b/Spring-Boot-Demo/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml deleted file mode 100644 index 20e2920..0000000 --- a/Spring-Boot-Demo/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/misc.xml b/Spring-Boot-Demo/.idea/misc.xml deleted file mode 100644 index 7b904ec..0000000 --- a/Spring-Boot-Demo/.idea/misc.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/modules.xml b/Spring-Boot-Demo/.idea/modules.xml deleted file mode 100644 index dff154d..0000000 --- a/Spring-Boot-Demo/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/uiDesigner.xml b/Spring-Boot-Demo/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/Spring-Boot-Demo/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/.idea/workspace.xml b/Spring-Boot-Demo/.idea/workspace.xml deleted file mode 100644 index c1b2b07..0000000 --- a/Spring-Boot-Demo/.idea/workspace.xml +++ /dev/null @@ -1,1268 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Thymeleaf - - - - - ThymeleafVariablesResolveInspection - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - project - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - C:\Users\牛李\AppData\Roaming\Subversion - - - - - 1470710399332 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Spring - - - - - - - - - - - - - - - 1.8 - - - - - - - - SpringBoot - - - - - - - - 1.8 - - - - - - - - Maven: ch.qos.logback:logback-classic:1.1.7 - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/SpringBoot.iml b/Spring-Boot-Demo/SpringBoot.iml deleted file mode 100644 index 6640cf1..0000000 --- a/Spring-Boot-Demo/SpringBoot.iml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Spring-Boot-Demo/pom.xml b/Spring-Boot-Demo/pom.xml index 96fdc57..04ef1ea 100644 --- a/Spring-Boot-Demo/pom.xml +++ b/Spring-Boot-Demo/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cn.mrdear - mrdear + Spring-Boot-Demo 1.0-SNAPSHOT jar diff --git a/Spring-Boot-Demo/src/main/resources/application.properties b/Spring-Boot-Demo/src/main/resources/application.properties index 884a55a..28aeafb 100644 --- a/Spring-Boot-Demo/src/main/resources/application.properties +++ b/Spring-Boot-Demo/src/main/resources/application.properties @@ -10,7 +10,7 @@ logging.level.cn.mrdear.mapper = trace #thymeleaf start spring.thymeleaf.mode=HTML5 spring.thymeleaf.encoding=UTF-8 -spring.thymeleaf.content-type=text/html -#��ʱ�رջ��,��Ȼû��ʵʱҳ�� +spring.thymeleaf.contents-type=text/html +#��ʱ�رջ��,��Ȼû��ʵʱҳ�� spring.thymeleaf.cache=false #thymeleaf end diff --git a/Spring-Boot-Demo/src/main/resources/templates/hello.html b/Spring-Boot-Demo/src/main/resources/templates/hello.html index 0da11da..b78e8a1 100644 --- a/Spring-Boot-Demo/src/main/resources/templates/hello.html +++ b/Spring-Boot-Demo/src/main/resources/templates/hello.html @@ -2,7 +2,7 @@ hello - + diff --git a/Spring-Cloud-Demo/Service-Discovery-Eureka/pom.xml b/Spring-Cloud-Demo/Service-Discovery-Eureka/pom.xml new file mode 100644 index 0000000..9d30f7b --- /dev/null +++ b/Spring-Cloud-Demo/Service-Discovery-Eureka/pom.xml @@ -0,0 +1,28 @@ + + + + cn.mrdear.springcloud + springcloud-parent + 1.0.0 + + 4.0.0 + service-discovery-eureka + + + + org.springframework.cloud + spring-cloud-starter-eureka-server + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + \ No newline at end of file diff --git a/Spring-Cloud-Demo/Service-Discovery-Eureka/src/main/java/cn/mrdear/EurekaApplication.java b/Spring-Cloud-Demo/Service-Discovery-Eureka/src/main/java/cn/mrdear/EurekaApplication.java new file mode 100644 index 0000000..b60fdc0 --- /dev/null +++ b/Spring-Cloud-Demo/Service-Discovery-Eureka/src/main/java/cn/mrdear/EurekaApplication.java @@ -0,0 +1,17 @@ +package cn.mrdear; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; + +/** + * @author Niu Li + * @since 2017/5/25 + */ +@EnableEurekaServer//启动服务注册中心 +@SpringBootApplication +public class EurekaApplication { + public static void main(String[] args) { + SpringApplication.run(EurekaApplication.class,args); + } +} diff --git a/Spring-Cloud-Demo/Service-Discovery-Eureka/src/main/resources/application.yml b/Spring-Cloud-Demo/Service-Discovery-Eureka/src/main/resources/application.yml new file mode 100644 index 0000000..4bb275e --- /dev/null +++ b/Spring-Cloud-Demo/Service-Discovery-Eureka/src/main/resources/application.yml @@ -0,0 +1,19 @@ + +server: + port: 8761 + +spring: + application: + name: eureka-server + +eureka: + instance: + hostname: localhost + prefer-ip-address: true + client: + register-with-eureka: false + fetch-registry: false + service-url: + defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/ + + diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/pom.xml b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/pom.xml new file mode 100644 index 0000000..7a1f4b0 --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/pom.xml @@ -0,0 +1,25 @@ + + + + springcloud-parent + cn.mrdear.springcloud + 1.0.0 + + 4.0.0 + + cn.mrdear.springcloud + Service-Product-Consumer-Feign-Hystrix + + + + org.springframework.cloud + spring-cloud-starter-feign + + + org.springframework.cloud + spring-cloud-starter-eureka + + + \ No newline at end of file diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/UserConsumeFeignHystrixApplication.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/UserConsumeFeignHystrixApplication.java new file mode 100644 index 0000000..e9f93d4 --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/UserConsumeFeignHystrixApplication.java @@ -0,0 +1,19 @@ +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.netflix.feign.EnableFeignClients; + + +/** + * @author Niu Li + * @since 2017/6/3 + */ +@SpringBootApplication(scanBasePackages = "cn.medear.springcloud") +@EnableDiscoveryClient +@EnableFeignClients(basePackages = "cn.medear.springcloud.restclient") +public class UserConsumeFeignHystrixApplication { + + public static void main(String[] args) { + SpringApplication.run(UserConsumeFeignHystrixApplication.class, args); + } +} diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/controller/ConsumeUserController.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/controller/ConsumeUserController.java new file mode 100644 index 0000000..e53e366 --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/controller/ConsumeUserController.java @@ -0,0 +1,41 @@ +package cn.medear.springcloud.controller; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +import cn.medear.springcloud.entity.User; +import cn.medear.springcloud.restclient.UserClient; +import lombok.extern.slf4j.Slf4j; + +/** + * 用于消费UserService的类 + * @author Niu Li + * @since 2017/6/3 + */ +@RestController +@Slf4j +public class ConsumeUserController { + + @Resource + private UserClient userClient; + + private static final ObjectMapper objectMapper = new ObjectMapper(); + + @GetMapping("/{id}") + public String findUserById(@PathVariable Long id) { + User user = userClient.findById(id); + String valueAsString = null; + try { + valueAsString = objectMapper.writeValueAsString(user); + } catch (JsonProcessingException e) { + log.error("parse json error. {}",e); + } + return valueAsString; + } +} diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/entity/User.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/entity/User.java new file mode 100644 index 0000000..2dc8e22 --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/entity/User.java @@ -0,0 +1,25 @@ +package cn.medear.springcloud.entity; + +import java.io.Serializable; + +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +/** + * @author Niu Li + * @since 2017/6/3 + */ +@Data +@NoArgsConstructor +@ToString +public class User implements Serializable{ + + private static final long serialVersionUID = -2885884654600114856L; + + private Long id; + + private String username; + + private String password; +} diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/restclient/UserClient.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/restclient/UserClient.java new file mode 100644 index 0000000..2d75906 --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/restclient/UserClient.java @@ -0,0 +1,21 @@ +package cn.medear.springcloud.restclient; + +import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import cn.medear.springcloud.entity.User; +import cn.medear.springcloud.restclient.failback.UserClientFailBack; + +/** + * @author Niu Li + * @since 2017/6/4 + */ +@FeignClient(name = "service-user-provider",fallbackFactory = UserClientFailBack.class) +public interface UserClient { + + @RequestMapping(value = "/{id}",method = RequestMethod.GET) + User findById(@PathVariable("id") Long id); + +} diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/restclient/failback/UserClientFailBack.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/restclient/failback/UserClientFailBack.java new file mode 100644 index 0000000..4004042 --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/java/cn/medear/springcloud/restclient/failback/UserClientFailBack.java @@ -0,0 +1,40 @@ +package cn.medear.springcloud.restclient.failback; + +import org.springframework.stereotype.Component; + +import cn.medear.springcloud.entity.User; +import cn.medear.springcloud.restclient.UserClient; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; + +/** + * 用户调用断路器 + * @author Niu Li + * @since 2017/6/4 + */ +@Slf4j +@Component +public class UserClientFailBack implements FallbackFactory{ + + private static UserClient userClient = new UserClientFailBackWithInfo(); + + /** + * 错误返回内容配置 + */ + @Override + public UserClient create(Throwable throwable) { + log.error("UserClient hystrix open,error is {}",throwable.getMessage()); + return userClient; + } + + + private static class UserClientFailBackWithInfo implements UserClient{ + @Override + public User findById(Long id) { + User user = new User(); + user.setId(0L); + user.setUsername("失败用户"); + return user; + } + } +} diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/resources/application.yml b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/resources/application.yml new file mode 100644 index 0000000..729bcbe --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign-Hystrix/src/main/resources/application.yml @@ -0,0 +1,24 @@ +server: + port: 8086 + +spring: + application: + name: service-product-consumer-fegin-hystrix + +eureka: + client: + service-url: + default-zone: http://localhost:8761/eureka/ + instance: + prefer-ip-address: true + +#开启断路器 +feign: + hystrix: + enabled: true + +# 负载均衡配置为随机,不配置默认轮询 +service-user-provider: + ribbon: + NFLoadBalancerRuleClassName: com.netflix.loadbalancer.RandomRule + diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign/pom.xml b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/pom.xml new file mode 100644 index 0000000..57785b7 --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/pom.xml @@ -0,0 +1,30 @@ + + + + springcloud-parent + cn.mrdear.springcloud + 1.0.0 + + 4.0.0 + + cn.mrdear.springcloud + Service-Product-Consumer-Feign + + + + org.springframework.cloud + spring-cloud-starter-feign + + + io.github.openfeign + feign-httpclient + 9.5.0 + + + org.springframework.cloud + spring-cloud-starter-eureka + + + \ No newline at end of file diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/UserConsumeFeignApplication.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/UserConsumeFeignApplication.java new file mode 100644 index 0000000..7ad8139 --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/UserConsumeFeignApplication.java @@ -0,0 +1,46 @@ +import org.apache.http.client.HttpClient; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.config.RegistryBuilder; +import org.apache.http.conn.socket.ConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.netflix.feign.EnableFeignClients; +import org.springframework.context.annotation.Bean; + + +/** + * @author Niu Li + * @since 2017/6/3 + */ +@SpringBootApplication(scanBasePackages = "cn.medear.springcloud.controller") +@EnableDiscoveryClient +@EnableFeignClients(basePackages = "cn.medear.springcloud.restclient") +public class UserConsumeFeignApplication { + + public static void main(String[] args) { + SpringApplication.run(UserConsumeFeignApplication.class, args); + } + + /** + * 自定义feign的Httpclient,其注入在HttpClientFeignLoadBalancedConfiguration中 + * @return + */ + @Bean + public HttpClient feignHttpClient() { + PoolingHttpClientConnectionManager HTTP_CLIENT_CONNECTION_MANAGER = + new PoolingHttpClientConnectionManager(RegistryBuilder.create().register("http", PlainConnectionSocketFactory.getSocketFactory()).register("https", SSLConnectionSocketFactory.getSocketFactory()).build()); + HTTP_CLIENT_CONNECTION_MANAGER.setDefaultMaxPerRoute(100); + HTTP_CLIENT_CONNECTION_MANAGER.setMaxTotal(200); + RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(60000).setConnectTimeout(60000).setSocketTimeout(60000).build(); + CloseableHttpClient httpClient = HttpClientBuilder.create() + .setConnectionManager(HTTP_CLIENT_CONNECTION_MANAGER) + .setDefaultRequestConfig(requestConfig).build(); + return httpClient; + } +} diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/controller/ConsumeUserController.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/controller/ConsumeUserController.java new file mode 100644 index 0000000..e53e366 --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/controller/ConsumeUserController.java @@ -0,0 +1,41 @@ +package cn.medear.springcloud.controller; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +import cn.medear.springcloud.entity.User; +import cn.medear.springcloud.restclient.UserClient; +import lombok.extern.slf4j.Slf4j; + +/** + * 用于消费UserService的类 + * @author Niu Li + * @since 2017/6/3 + */ +@RestController +@Slf4j +public class ConsumeUserController { + + @Resource + private UserClient userClient; + + private static final ObjectMapper objectMapper = new ObjectMapper(); + + @GetMapping("/{id}") + public String findUserById(@PathVariable Long id) { + User user = userClient.findById(id); + String valueAsString = null; + try { + valueAsString = objectMapper.writeValueAsString(user); + } catch (JsonProcessingException e) { + log.error("parse json error. {}",e); + } + return valueAsString; + } +} diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/entity/User.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/entity/User.java new file mode 100644 index 0000000..2dc8e22 --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/entity/User.java @@ -0,0 +1,25 @@ +package cn.medear.springcloud.entity; + +import java.io.Serializable; + +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +/** + * @author Niu Li + * @since 2017/6/3 + */ +@Data +@NoArgsConstructor +@ToString +public class User implements Serializable{ + + private static final long serialVersionUID = -2885884654600114856L; + + private Long id; + + private String username; + + private String password; +} diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/restclient/UserClient.java b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/restclient/UserClient.java new file mode 100644 index 0000000..28606ea --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/java/cn/medear/springcloud/restclient/UserClient.java @@ -0,0 +1,20 @@ +package cn.medear.springcloud.restclient; + +import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import cn.medear.springcloud.entity.User; + +/** + * @author Niu Li + * @since 2017/6/4 + */ +@FeignClient("service-user-provider") +public interface UserClient { + + @RequestMapping(value = "/{id}",method = RequestMethod.GET) + User findById(@PathVariable("id") Long id); + +} diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/resources/application.yml b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/resources/application.yml new file mode 100644 index 0000000..a57867d --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Feign/src/main/resources/application.yml @@ -0,0 +1,23 @@ +server: + port: 8085 + +spring: + application: + name: service-product-consumer-fegin + +eureka: + client: + service-url: + default-zone: http://localhost:8761/eureka/ + instance: + prefer-ip-address: true + +feign: + httpclient: + enabled: true + +# 负载均衡配置为随机,不配置默认轮询 +service-user-provider: + ribbon: + NFLoadBalancerRuleClassName: com.netflix.loadbalancer.RandomRule + diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/pom.xml b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/pom.xml new file mode 100644 index 0000000..5418098 --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/pom.xml @@ -0,0 +1,22 @@ + + + + springcloud-parent + cn.mrdear.springcloud + 1.0.0 + + 4.0.0 + + cn.mrdear.springcloud + Service-Product-Consumer-Ribbon + + + + org.springframework.cloud + spring-cloud-starter-eureka + + + + \ No newline at end of file diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/UserConsumeApplication.java b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/UserConsumeApplication.java new file mode 100644 index 0000000..5366289 --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/UserConsumeApplication.java @@ -0,0 +1,19 @@ +package cn.mrdear.springcloud; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +/** + * @author Niu Li + * @since 2017/6/3 + */ +@SpringBootApplication +@EnableDiscoveryClient +public class UserConsumeApplication { + + public static void main(String[] args) { + SpringApplication.run(UserConsumeApplication.class,args); + } + +} diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/config/BeanConfig.java b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/config/BeanConfig.java new file mode 100644 index 0000000..13e312c --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/config/BeanConfig.java @@ -0,0 +1,22 @@ +package cn.mrdear.springcloud.config; + +import org.springframework.cloud.client.loadbalancer.LoadBalanced; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestTemplate; + +/** + * @author Niu Li + * @since 2017/6/3 + */ +@Configuration +//@RibbonClient(name = "user-resporitory",configuration = MyConfig.class) +//可以指定针对某服务器采取指定的配置负载均衡算法,配置文件中配置更加方便 +public class BeanConfig { + + @Bean + @LoadBalanced //开启客户端负载均衡,自动配置类在LoadBalancerAutoConfiguration中 + public RestTemplate restTemplate(){ + return new RestTemplate(); + } +} diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/controller/ConsumeUserController.java b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/controller/ConsumeUserController.java new file mode 100644 index 0000000..a839637 --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/java/cn/mrdear/springcloud/controller/ConsumeUserController.java @@ -0,0 +1,25 @@ +package cn.mrdear.springcloud.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.RestTemplate; + +import javax.annotation.Resource; + +/** + * 用于消费UserService的类 + * @author Niu Li + * @since 2017/6/3 + */ +@RestController +public class ConsumeUserController { + + @Resource + private RestTemplate restTemplate; + + @GetMapping("/{id}") + public String findUserById(@PathVariable Long id) { + return restTemplate.getForObject("http://service-user-provider/"+id,String.class); + } +} diff --git a/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/resources/application.yml b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/resources/application.yml new file mode 100644 index 0000000..efa8d13 --- /dev/null +++ b/Spring-Cloud-Demo/Service-Product-Consumer-Ribbon/src/main/resources/application.yml @@ -0,0 +1,18 @@ +server: + port: 8082 + +spring: + application: + name: service-product-consumer-ribbon + +eureka: + client: + service-url: + default-zone: http://localhost:8761/eureka/ + instance: + prefer-ip-address: true + +# 负载均衡配置为随机,不配置默认轮询 +service-user-provider: + ribbon: + NFLoadBalancerRuleClassName: com.netflix.loadbalancer.RandomRule diff --git a/Spring-Cloud-Demo/Service-User-Provider/pom.xml b/Spring-Cloud-Demo/Service-User-Provider/pom.xml new file mode 100644 index 0000000..e1b37bb --- /dev/null +++ b/Spring-Cloud-Demo/Service-User-Provider/pom.xml @@ -0,0 +1,47 @@ + + + + springcloud-parent + cn.mrdear.springcloud + 1.0.0 + + 4.0.0 + + cn.mrdear.springcloud + Service-User-Provider + + + + + com.h2database + h2 + runtime + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.cloud + spring-cloud-starter-eureka + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + \ No newline at end of file diff --git a/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/UserApplication.java b/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/UserApplication.java new file mode 100644 index 0000000..acfdfec --- /dev/null +++ b/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/UserApplication.java @@ -0,0 +1,19 @@ +package cn.mrdear; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +/** + * @author Niu Li + * @since 2017/5/25 + */ +@EnableDiscoveryClient +@SpringBootApplication +public class UserApplication { + + public static void main(String[] args) { + SpringApplication.run(UserApplication.class,args); + } + +} diff --git a/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/controller/UserController.java b/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/controller/UserController.java new file mode 100644 index 0000000..4135af0 --- /dev/null +++ b/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/controller/UserController.java @@ -0,0 +1,61 @@ +package cn.mrdear.controller; + + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.client.ServiceInstance; +import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +import javax.annotation.Resource; + +import cn.mrdear.entity.User; +import cn.mrdear.resporitory.UserResporitory; + +/** + * @author Niu Li + * @since 2017/5/25 + */ +@RestController +public class UserController { + + @Value("${spring.application.name}") + private String serverName; + + @Resource + private UserResporitory userResporitory; + + @Resource + private DiscoveryClient discoveryClient; + + @RequestMapping(value = "/add" ,method = RequestMethod.GET) + public User add(String username,String password) { + User user = new User(); + user.setUsername(username); + user.setPassword(password); + userResporitory.saveAndFlush(user); + return user; + } + + @GetMapping("/{id}") + public User find(@PathVariable Long id) { + return userResporitory.findOne(id); + } + + @GetMapping("/list") + public List findAll(){ + return userResporitory.findAll(); + } + + @GetMapping("/console") + public List console(){ + List instances = discoveryClient.getInstances(serverName); + return instances; + } + +} diff --git a/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/entity/User.java b/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/entity/User.java new file mode 100644 index 0000000..fb3e22c --- /dev/null +++ b/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/entity/User.java @@ -0,0 +1,32 @@ +package cn.mrdear.entity; + +import java.io.Serializable; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +/** + * @author Niu Li + * @since 2017/6/3 + */ +@Data +@NoArgsConstructor +@ToString +@Entity +public class User implements Serializable{ + + private static final long serialVersionUID = -2885884654600114856L; + + @Id + @GeneratedValue + private Long id; + + private String username; + + private String password; +} diff --git a/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/resporitory/UserResporitory.java b/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/resporitory/UserResporitory.java new file mode 100644 index 0000000..36ec6bd --- /dev/null +++ b/Spring-Cloud-Demo/Service-User-Provider/src/main/java/cn/mrdear/resporitory/UserResporitory.java @@ -0,0 +1,15 @@ +package cn.mrdear.resporitory; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import cn.mrdear.entity.User; + +/** + * @author Niu Li + * @since 2017/6/3 + */ +@Repository +public interface UserResporitory extends JpaRepository{ + +} diff --git a/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/application.yml b/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/application.yml new file mode 100644 index 0000000..dec0aa8 --- /dev/null +++ b/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/application.yml @@ -0,0 +1,20 @@ +server: + port: 8083 +spring: + application: + name: service-user-provider + jpa: + generate-ddl: false + show-sql: true + hibernate: + ddl-auto: none + datasource: + platform: h2 + schema: classpath:database/schema.sql + data: classpath:database/data.sql +eureka: + client: + service-url: + default-zone: http://localhost:8761/eureka/ + instance: + prefer-ip-address: true \ No newline at end of file diff --git a/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/database/data.sql b/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/database/data.sql new file mode 100644 index 0000000..8d203ef --- /dev/null +++ b/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/database/data.sql @@ -0,0 +1,3 @@ +INSERT INTO user(username,password) VALUES ('张三','111111'); +INSERT INTO user(username,password) VALUES ('李四','111111'); +INSERT INTO user(username,password) VALUES ('王二','111111'); \ No newline at end of file diff --git a/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/database/schema.sql b/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/database/schema.sql new file mode 100644 index 0000000..737b628 --- /dev/null +++ b/Spring-Cloud-Demo/Service-User-Provider/src/main/resources/database/schema.sql @@ -0,0 +1,6 @@ +drop table user if exists; +create table user ( + id INT(11) AUTO_INCREMENT PRIMARY KEY , + username VARCHAR(255), + password VARCHAR(255) + ); \ No newline at end of file diff --git a/Spring-Cloud-Demo/Service-User-Provider/target/classes/cn/mrdear/Application.class b/Spring-Cloud-Demo/Service-User-Provider/target/classes/cn/mrdear/Application.class new file mode 100644 index 0000000..0625b42 Binary files /dev/null and b/Spring-Cloud-Demo/Service-User-Provider/target/classes/cn/mrdear/Application.class differ diff --git a/Spring-Cloud-Demo/pom.xml b/Spring-Cloud-Demo/pom.xml new file mode 100644 index 0000000..9b0ac77 --- /dev/null +++ b/Spring-Cloud-Demo/pom.xml @@ -0,0 +1,74 @@ + + + 4.0.0 + + cn.mrdear.springcloud + springcloud-parent + pom + 1.0.0 + + + Service-Discovery-Eureka + Service-User-Provider + Service-Product-Consumer-Ribbon + Service-Product-Consumer-Feign + Service-Product-Consumer-Feign-Hystrix + + + + + org.springframework.boot + spring-boot-starter-parent + 1.5.2.RELEASE + + + + Dalston.SR1 + + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.projectlombok + lombok + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 1.8 + 1.8 + 1.8 + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/Spring-Data-Redis/pom.xml b/Spring-Data-Redis/pom.xml new file mode 100644 index 0000000..ff7aa0f --- /dev/null +++ b/Spring-Data-Redis/pom.xml @@ -0,0 +1,64 @@ + + + 4.0.0 + + cn.mrdear + Spring-Data-Redis + 1.0.0 + Spring-Data-Redis + + + org.springframework.boot + spring-boot-starter-parent + 1.5.2.RELEASE + + + + UTF-8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-data-redis + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + test + + + + io.springfox + springfox-swagger-ui + 2.6.1 + + + io.springfox + springfox-swagger2 + 2.6.1 + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/Spring-Data-Redis/src/main/java/cn/mrdear/Application.java b/Spring-Data-Redis/src/main/java/cn/mrdear/Application.java new file mode 100644 index 0000000..be24911 --- /dev/null +++ b/Spring-Data-Redis/src/main/java/cn/mrdear/Application.java @@ -0,0 +1,17 @@ +package cn.mrdear; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @author Niu Li + * @since 2017/3/28 + */ +@SpringBootApplication +public class Application { + public static void main( String[] args ) + { + SpringApplication.run(Application.class, args); + } + +} diff --git a/Spring-Data-Redis/src/main/java/cn/mrdear/conf/SwaggerConfig.java b/Spring-Data-Redis/src/main/java/cn/mrdear/conf/SwaggerConfig.java new file mode 100644 index 0000000..e7f7c12 --- /dev/null +++ b/Spring-Data-Redis/src/main/java/cn/mrdear/conf/SwaggerConfig.java @@ -0,0 +1,59 @@ +package cn.mrdear.conf; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.context.request.async.DeferredResult; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; + +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Contact; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +/** + * @author Niu Li + * @since 2017/3/30 + */ +@Configuration +@EnableSwagger2 +public class SwaggerConfig extends WebMvcConfigurerAdapter { + + /** + * 使用enableMVC注解的话,该配置必须,否则无法映射资源 + */ + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + registry.addResourceHandler("swagger-ui.html") + .addResourceLocations("classpath:/META-INF/resources/"); + registry.addResourceHandler("/webjars/**") + .addResourceLocations("classpath:/META-INF/resources/webjars/"); + + } + + @Bean + public Docket createRestApi() { + return new Docket(DocumentationType.SWAGGER_2) + .groupName("api") + .genericModelSubstitutes(DeferredResult.class) + .useDefaultResponseMessages(false) + .forCodeGeneration(true) + .pathMapping("/") + .select() + .build() + .apiInfo(apiInfo()); + } + + private ApiInfo apiInfo() { + Contact contact = new Contact("屈定","http://mrdear.cn","niudear@foxmail.com"); + return new ApiInfoBuilder() + .title("Spring Data Redis") + .description("Spring Data Redis学习记录") + .termsOfServiceUrl("http://mrdear.cn") + .contact(contact) + .version("1.0") + .build(); + } +} diff --git a/Spring-Data-Redis/src/main/java/cn/mrdear/controller/UserController.java b/Spring-Data-Redis/src/main/java/cn/mrdear/controller/UserController.java new file mode 100644 index 0000000..6eda395 --- /dev/null +++ b/Spring-Data-Redis/src/main/java/cn/mrdear/controller/UserController.java @@ -0,0 +1,63 @@ +package cn.mrdear.controller; + +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +import javax.annotation.Resource; + +import cn.mrdear.dao.UserDao; +import cn.mrdear.model.User; +import cn.mrdear.util.MockUserUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; + +/** + * @author Niu Li + * @since 2017/3/30 + */ +@Api(description = "提供增删改查,swagger示例",tags = "API-UserController") +@RestController +@RequestMapping(value = "/api/v1") +public class UserController { + @Resource + private UserDao userDao; + + @ApiOperation(value = "查询全部用户",httpMethod = "GET") + @ApiResponse(code = 200,message = "Success") + @RequestMapping(value = "/users",method = RequestMethod.GET) + public List getAllUsers(){ + return userDao.query(); + } + + @ApiOperation(value = "查询单个用户",notes = "根据传入id查找用户",httpMethod = "GET") + @ApiResponse(code = 200,message = "Success") + @RequestMapping(value = "/user/{id}",method = RequestMethod.GET) + public User getUser(@PathVariable("id") Integer id){ + return userDao.find(id); + } + + @ApiOperation(value = "批量插入用户",notes = "根据传入参数增加用户",httpMethod = "POST") + @ApiResponse(code = 200,message = "Success") + @RequestMapping(value = "/user",method = RequestMethod.POST) + public List InsertUser(Integer nums){ + if (Objects.isNull(nums)){ + nums = 10; + } + List users = new ArrayList<>(); + for (Integer i = 0; i < nums; i++) { + User user = MockUserUtil.mockSignle(); + userDao.save(user); + users.add(user); + } + return users; + } + + +} diff --git a/Spring-Data-Redis/src/main/java/cn/mrdear/dao/UserDao.java b/Spring-Data-Redis/src/main/java/cn/mrdear/dao/UserDao.java new file mode 100644 index 0000000..35b01e8 --- /dev/null +++ b/Spring-Data-Redis/src/main/java/cn/mrdear/dao/UserDao.java @@ -0,0 +1,84 @@ +package cn.mrdear.dao; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.data.redis.core.HashOperations; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Repository; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +import javax.annotation.Resource; + +import cn.mrdear.model.User; + +/** + * redis操作示例 + * + * @author Niu Li + * @since 2017/3/30 + */ +@Repository +public class UserDao { + private static Logger logger = LoggerFactory.getLogger(UserDao.class); + @Resource + private StringRedisTemplate stringRedisTemplate; + + private static final String KEY_PREFIX = "users"; + + private ObjectMapper objectMapper = new ObjectMapper(); + + /** + * 保存一个用户 + */ + public void save(User user) { + HashOperations opsForHash = stringRedisTemplate.opsForHash(); + try { + opsForHash.put(KEY_PREFIX, user.getId() + "", objectMapper.writeValueAsString(user)); + } catch (JsonProcessingException e) { + logger.error("save user error,user id is ", user.getId()); + } + } + + /** + * 插入一个用户 + * @param id 用户id + * @return 用户 + */ + public User find(Integer id) { + try { + HashOperations opsForHash = stringRedisTemplate.opsForHash(); + String userJson = opsForHash.get(KEY_PREFIX, id.toString()); + if (Objects.isNull(userJson)){ + return null; + } + return objectMapper.readValue(userJson, User.class); + } catch (IOException e) { + logger.error("find user error id is {}",id); + } + return null; + } + + /** + * 查询全部用户 + */ + public List query(){ + HashOperations opsForHash = stringRedisTemplate.opsForHash(); + List usersJson = opsForHash.values(KEY_PREFIX); + List users = new ArrayList<>(usersJson.size()); + usersJson.forEach(x -> { + try { + users.add(objectMapper.readValue(x,User.class)); + } catch (IOException e) { + logger.error("read user error id is {}",x); + } + }); + return users; + } +} diff --git a/Spring-Data-Redis/src/main/java/cn/mrdear/model/User.java b/Spring-Data-Redis/src/main/java/cn/mrdear/model/User.java new file mode 100644 index 0000000..f9047ed --- /dev/null +++ b/Spring-Data-Redis/src/main/java/cn/mrdear/model/User.java @@ -0,0 +1,36 @@ +package cn.mrdear.model; + +/** + * 测试用户 + * @author Niu Li + * @since 2017/3/30 + */ +public class User { + private Long id; + private String username; + private String password; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} diff --git a/Spring-Data-Redis/src/main/java/cn/mrdear/publish/Listen.java b/Spring-Data-Redis/src/main/java/cn/mrdear/publish/Listen.java new file mode 100644 index 0000000..841fdc1 --- /dev/null +++ b/Spring-Data-Redis/src/main/java/cn/mrdear/publish/Listen.java @@ -0,0 +1,29 @@ +package cn.mrdear.publish; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import java.util.concurrent.CountDownLatch; + +/** + * 消息订阅者 + * @author Niu Li + * @since 2017/3/29 + */ +@Component +public class Listen { + + private static Logger logger = LoggerFactory.getLogger(Listen.class); + + private CountDownLatch latch = new CountDownLatch(1); + + public void handleMsg(String message) { + logger.info("reciver msg :" + message); + latch.countDown(); + } + + public CountDownLatch getLatch() { + return latch; + } +} diff --git a/Spring-Data-Redis/src/main/java/cn/mrdear/publish/PublishConfig.java b/Spring-Data-Redis/src/main/java/cn/mrdear/publish/PublishConfig.java new file mode 100644 index 0000000..51bdc5e --- /dev/null +++ b/Spring-Data-Redis/src/main/java/cn/mrdear/publish/PublishConfig.java @@ -0,0 +1,37 @@ +package cn.mrdear.publish; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.listener.PatternTopic; +import org.springframework.data.redis.listener.RedisMessageListenerContainer; +import org.springframework.data.redis.listener.adapter.MessageListenerAdapter; + +/** + * @author Niu Li + * @since 2017/3/29 + */ +@Configuration +public class PublishConfig { + /** + * 注入消息容器 + * @param jedisConnectionFactory jedis连接池 + * @param listenerAdapter 监听适配器 + * @return bean + */ + @Bean + public RedisMessageListenerContainer container(RedisConnectionFactory jedisConnectionFactory, + MessageListenerAdapter listenerAdapter){ + RedisMessageListenerContainer container = new RedisMessageListenerContainer(); + container.setConnectionFactory(jedisConnectionFactory); + //绑定监听者与信道的管理 + container.addMessageListener(listenerAdapter,new PatternTopic("java")); + return container; + } + + @Bean + public MessageListenerAdapter adapter(Listen listen){ + //指定监听者和监听方法 + return new MessageListenerAdapter(listen,"handleMsg"); + } +} diff --git a/Spring-Data-Redis/src/main/java/cn/mrdear/util/MockUserUtil.java b/Spring-Data-Redis/src/main/java/cn/mrdear/util/MockUserUtil.java new file mode 100644 index 0000000..23110ed --- /dev/null +++ b/Spring-Data-Redis/src/main/java/cn/mrdear/util/MockUserUtil.java @@ -0,0 +1,49 @@ +package cn.mrdear.util; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.UUID; + +import cn.mrdear.model.User; + +/** + * mock虚拟用户 + * @author Niu Li + * @since 2017/3/30 + */ +public class MockUserUtil { + + //mock数据来源 + private static String[] namePrefix = {"赵","钱","孙","李","周","吴","郑","王"}; + private static String[] nameSuffix = {"一","二","三","四","五","六","七","八"}; + + private static Random random = new Random(); + + /** + * mock用户 + * @return 用户实体 + */ + public static User mockSignle(){ + User user = new User(); + int x = random.nextInt(namePrefix.length); + String userName = namePrefix[x]+nameSuffix[x]; + user.setId((long) x); + user.setUsername(userName); + user.setPassword(UUID.randomUUID().toString()); + return user; + } + + /** + * mock集合 + * @param num 集合数量 + * @return 集合 + */ + public static List mockList(int num){ + List users = new ArrayList<>(); + for (int i = 0; i < num; i++) { + users.add(mockSignle()); + } + return users; + } +} diff --git a/Spring-Data-Redis/src/main/resources/application.properties b/Spring-Data-Redis/src/main/resources/application.properties new file mode 100644 index 0000000..3fb5d36 --- /dev/null +++ b/Spring-Data-Redis/src/main/resources/application.properties @@ -0,0 +1,24 @@ +#logger start +logging.path = logs/loging.log +logging.level.cn.mrdear = debug +#logger end + +# spring date redis start +# Redis数据库索引（默认为0） +spring.redis.database=0 +# Redis服务器地址 +spring.redis.host=115.159.185.14 +# Redis服务器连接端口 +spring.redis.port=6379 +# Redis服务器连接密码（默认为空） +spring.redis.password= +# 连接池最大连接数（使用负值表示没有限制） +spring.redis.pool.max-active=8 +# 连接池最大阻塞等待时间（使用负值表示没有限制） +spring.redis.pool.max-wait=-1 +# 连接池中的最大空闲连接 +spring.redis.pool.max-idle=8 +# 连接池中的最小空闲连接 +spring.redis.pool.min-idle=0 +# 连接超时时间（毫秒） +spring.redis.timeout=2000 diff --git a/Spring-Data-Redis/src/test/java/cn/mrdear/test/RedisConnectTest.java b/Spring-Data-Redis/src/test/java/cn/mrdear/test/RedisConnectTest.java new file mode 100644 index 0000000..131413d --- /dev/null +++ b/Spring-Data-Redis/src/test/java/cn/mrdear/test/RedisConnectTest.java @@ -0,0 +1,86 @@ +package cn.mrdear.test; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.dao.DataAccessException; +import org.springframework.data.redis.connection.RedisConnection; +import org.springframework.data.redis.connection.StringRedisConnection; +import org.springframework.data.redis.core.RedisCallback; +import org.springframework.data.redis.core.RedisOperations; +import org.springframework.data.redis.core.SessionCallback; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import java.util.List; + +import javax.annotation.Resource; + +import cn.mrdear.Application; +import cn.mrdear.publish.Listen; + +/** + * @author Niu Li + * @since 2017/3/28 + */ +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = Application.class) +public class RedisConnectTest { + @Resource + private StringRedisTemplate stringRedisTemplate; + @Resource + private Listen listen; + @Test + public void testSetAndGet() { + stringRedisTemplate.opsForValue().set("ping","pong"); + System.out.println(stringRedisTemplate.opsForValue().get("ping")); + } + + @Test + public void testPublish() throws InterruptedException { + stringRedisTemplate.convertAndSend("java","hello world"); + listen.getLatch().await(); + } + + @Test + public void testMulti() { + boolean isThrow = false; + List