Skip to content

Commit 5a5c851

Browse files
VancySavokiVancySavoki
committed
Support quick start using h2 memory db.
some Code clean
1 parent b1c42ef commit 5a5c851

17 files changed

+517
-231
lines changed

‎moss-web/pom.xml‎

Lines changed: 99 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,71 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
6-
<parent>
7-
<groupId>org.xujin.moss</groupId>
8-
<artifactId>moss</artifactId>
9-
<version>1.0.0.RELEASE</version>
10-
</parent>
11-
12-
<groupId>org.xujin.moss</groupId>
13-
<artifactId>moss-web</artifactId>
14-
<version>1.0.0.RELEASE</version>
15-
<packaging>jar</packaging>
16-
17-
<name>moss-web</name>
18-
<description>moss-web</description>
19-
<dependencies>
20-
21-
<dependency>
22-
<groupId>org.xujin.moss</groupId>
23-
<artifactId>moss-client-2.x</artifactId>
24-
<version>1.0.0.RELEASE</version>
25-
</dependency>
26-
<!--
27-
<dependency>
28-
<groupId>org.xujin.moss</groupId>
29-
<artifactId>moss-adapter-nacos</artifactId>
30-
<version>1.0.0.RELEASE</version>
31-
</dependency>-->
32-
<dependency>
33-
<groupId>com.github.ulisesbocchio</groupId>
34-
<artifactId>jasypt-spring-boot-starter</artifactId>
35-
</dependency>
36-
37-
<dependency>
38-
<groupId>mysql</groupId>
39-
<artifactId>mysql-connector-java</artifactId>
40-
<scope>runtime</scope>
41-
<version>6.0.6</version>
42-
</dependency>
43-
44-
45-
<dependency>
46-
<groupId>org.xujin.moss</groupId>
47-
<artifactId>moss-extension</artifactId>
48-
</dependency>
49-
50-
<dependency>
51-
<groupId>org.springframework.boot</groupId>
52-
<artifactId>spring-boot-starter-web</artifactId>
53-
54-
</dependency>
55-
56-
<dependency>
57-
<groupId>org.springframework.boot</groupId>
58-
<artifactId>spring-boot-starter</artifactId>
59-
</dependency>
60-
61-
<dependency>
62-
<groupId>org.springframework.boot</groupId>
63-
<artifactId>spring-boot-starter-test</artifactId>
64-
<scope>test</scope>
65-
</dependency>
66-
67-
<dependency>
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<parent>
7+
<groupId>org.xujin.moss</groupId>
8+
<artifactId>moss</artifactId>
9+
<version>1.0.0.RELEASE</version>
10+
</parent>
11+
12+
<groupId>org.xujin.moss</groupId>
13+
<artifactId>moss-web</artifactId>
14+
<version>1.0.0.RELEASE</version>
15+
<packaging>jar</packaging>
16+
17+
<name>moss-web</name>
18+
<description>moss-web</description>
19+
<properties>
20+
<start-class>org.xujin.moss.MossApplication</start-class>
21+
</properties>
22+
<dependencies>
23+
24+
<dependency>
25+
<groupId>org.xujin.moss</groupId>
26+
<artifactId>moss-client-2.x</artifactId>
27+
<version>1.0.0.RELEASE</version>
28+
</dependency>
29+
<dependency>
30+
<groupId>com.github.ulisesbocchio</groupId>
31+
<artifactId>jasypt-spring-boot-starter</artifactId>
32+
</dependency>
33+
34+
<dependency>
35+
<groupId>mysql</groupId>
36+
<artifactId>mysql-connector-java</artifactId>
37+
<scope>runtime</scope>
38+
<version>6.0.6</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>com.h2database</groupId>
42+
<artifactId>h2</artifactId>
43+
<scope>runtime</scope>
44+
</dependency>
45+
46+
<dependency>
47+
<groupId>org.xujin.moss</groupId>
48+
<artifactId>moss-extension</artifactId>
49+
</dependency>
50+
51+
<dependency>
52+
<groupId>org.springframework.boot</groupId>
53+
<artifactId>spring-boot-starter-web</artifactId>
54+
55+
</dependency>
56+
57+
<dependency>
58+
<groupId>org.springframework.boot</groupId>
59+
<artifactId>spring-boot-starter</artifactId>
60+
</dependency>
61+
62+
<dependency>
63+
<groupId>org.springframework.boot</groupId>
64+
<artifactId>spring-boot-starter-test</artifactId>
65+
<scope>test</scope>
66+
</dependency>
67+
68+
<dependency>
6869
<groupId>io.springfox</groupId>
6970
<artifactId>springfox-swagger2</artifactId>
7071
<version>2.9.2</version>
@@ -78,65 +79,37 @@
7879

7980

8081

81-
</dependencies>
82-
83-
<build>
84-
<finalName>moss-web</finalName>
85-
<plugins>
86-
<plugin>
87-
<groupId>org.springframework.boot</groupId>
88-
<artifactId>spring-boot-maven-plugin</artifactId>
89-
<configuration>
90-
<mainClass>org.xujin.moss.MossApplication</mainClass>
91-
<layout>JAR</layout>
92-
</configuration>
93-
<executions>
94-
<execution>
95-
<goals>
96-
<goal>repackage</goal>
97-
<goal>build-info</goal>
98-
</goals>
99-
<configuration>
100-
<additionalProperties>
101-
<encoding.source>UTF-8</encoding.source>
102-
<encoding.reporting>UTF-8</encoding.reporting>
103-
<java.source>${maven.compiler.source}</java.source>
104-
<java.target>${maven.compiler.target}</java.target>
105-
<springcloud.version>${spring-cloud.version}</springcloud.version>
106-
</additionalProperties>
107-
</configuration>
108-
</execution>
109-
</executions>
110-
</plugin>
111-
<plugin>
112-
<groupId>org.apache.maven.plugins</groupId>
113-
<artifactId>maven-resources-plugin</artifactId>
114-
<configuration>
115-
<delimiters>@</delimiters>
116-
<useDefaultDelimiters>false</useDefaultDelimiters>
117-
</configuration>
118-
</plugin>
119-
<plugin>
120-
<groupId>pl.project13.maven</groupId>
121-
<artifactId>git-commit-id-plugin</artifactId>
122-
<version>2.1.15</version>
123-
<executions>
124-
<execution>
125-
<goals>
126-
<goal>revision</goal>
127-
</goals>
128-
</execution>
129-
</executions>
130-
<configuration>
131-
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
132-
</configuration>
133-
</plugin>
134-
</plugins>
135-
<resources>
136-
<resource>
137-
<directory>src/main/resources</directory>
138-
<filtering>true</filtering>
139-
</resource>
140-
</resources>
141-
</build>
82+
</dependencies>
83+
84+
<build>
85+
<finalName>moss-web</finalName>
86+
<plugins>
87+
<plugin>
88+
<groupId>org.springframework.boot</groupId>
89+
<artifactId>spring-boot-maven-plugin</artifactId>
90+
<configuration>
91+
<mainClass>${start-class}</mainClass>
92+
<layout>WAR</layout>
93+
</configuration>
94+
<executions>
95+
<execution>
96+
<goals>
97+
<goal>repackage</goal>
98+
<goal>build-info</goal>
99+
</goals>
100+
</execution>
101+
</executions>
102+
</plugin>
103+
<plugin>
104+
<groupId>pl.project13.maven</groupId>
105+
<artifactId>git-commit-id-plugin</artifactId>
106+
</plugin>
107+
</plugins>
108+
<resources>
109+
<resource>
110+
<directory>src/main/resources</directory>
111+
<filtering>true</filtering>
112+
</resource>
113+
</resources>
114+
</build>
142115
</project>

‎moss-web/src/main/java/org/xujin/moss/MossApplication.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.springframework.context.annotation.Configuration;
1313
import org.springframework.http.HttpStatus;
1414
import org.springframework.http.client.SimpleClientHttpRequestFactory;
15+
import org.springframework.scheduling.annotation.EnableAsync;
1516
import org.springframework.web.client.RestTemplate;
1617
import org.springframework.web.servlet.view.InternalResourceViewResolver;
1718
import org.xujin.moss.filter.CorsFilter;
@@ -24,6 +25,7 @@
2425
//@EnableScheduling
2526
@EnableDiscoveryClient
2627
@ComponentScan("org.xujin.moss.*")
28+
@EnableAsync
2729
public class MossApplication {
2830

2931
@Bean

‎moss-web/src/main/java/org/xujin/moss/config/ShiroAuthConfig.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@
55
import org.apache.shiro.spring.LifecycleBeanPostProcessor;
66
import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
77
import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
8-
import org.springframework.beans.factory.annotation.Autowired;
98
import org.springframework.context.annotation.DependsOn;
109
import org.xujin.moss.security.jwt.JwtFilter;
1110
import org.xujin.moss.security.jwt.ResourceCheckFilter;
1211
import org.xujin.moss.security.shiro.DBRealm;
13-
import org.xujin.moss.security.shiro.LdapRealm;
1412
import com.google.common.collect.Lists;
1513
import org.apache.shiro.mgt.SecurityManager;
1614
import org.apache.shiro.realm.Realm;
@@ -60,7 +58,7 @@ public ShiroFilterFactoryBean factory(@Qualifier("securityManager") SecurityMana
6058
}
6159

6260
@Bean("securityManager")
63-
public DefaultWebSecurityManager getManager(@Autowired UserService userService) {
61+
public DefaultWebSecurityManager getManager(UserService userService) {
6462
DefaultWebSecurityManager manager = new DefaultWebSecurityManager();
6563
List<Realm> realms = Lists.newArrayList();
6664
realms.add(new DBRealm(userService));

‎moss-web/src/main/java/org/xujin/moss/config/Swagger2Config.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.springframework.context.annotation.Bean;
44
import org.springframework.context.annotation.Configuration;
5-
import org.xujin.moss.client.utils.Analyzer;
65
import springfox.documentation.builders.ApiInfoBuilder;
76
import springfox.documentation.builders.PathSelectors;
87
import springfox.documentation.service.ApiInfo;

‎moss-web/src/main/resources/META-INF/spring-configuration-metadata.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{
66
"name": "logging.moss.path",
77
"type": "java.lang.String",
8-
"defaultValue":"/opt/app/logs",
8+
"defaultValue":"~/logs",
99
"description":"logback files prefix."
1010
}
1111
]

‎moss-web/src/main/resources/application-nacos.yml‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎moss-web/src/main/resources/application.yml‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎moss-web/src/main/resources/config/application-eureka.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
eureka:
2+
instance:
3+
leaseRenewalIntervalInSeconds: 10
4+
health-check-url-path: /actuator/health
5+
prefer-ip-address: true
6+
client:
7+
enabled: false

0 commit comments

Comments
 (0)