Skip to content

Commit

Permalink
change:上次忘记加application.properties文件了
Browse files Browse the repository at this point in the history
EggsBlue committed Feb 8, 2018

Verified

This commit was signed with the committer’s verified signature.
1 parent aa92df0 commit b72972c
Showing 4 changed files with 116 additions and 852 deletions.
188 changes: 102 additions & 86 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<groupId>com.dd</groupId>
@@ -9,132 +9,124 @@
<name>LuliChat Maven Webapp</name>
<url>http://maven.apache.org</url>


<properties>
<!-- UTF8大法好 -->
<nutzboot.version>2.2-SNAPSHOT</nutzboot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<nutzboot-version>2.2-SNAPSHOT</nutzboot-version>
</properties>

<dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.nutz</groupId>
<artifactId>nutzboot-starter-jetty</artifactId>
<version>${nutzboot-version}</version>
</dependency>
<dependency>
<groupId>org.nutz</groupId>
<artifactId>nutzboot-starter-nutz-mvc</artifactId>
<version>${nutzboot-version}</version>
</dependency>
<dependency>
<groupId>org.nutz</groupId>
<artifactId>nutzboot-starter-shiro</artifactId>
<version>${nutzboot-version}</version>
<artifactId>nutzboot-parent</artifactId>
<version>${nutzboot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.nutz</groupId>
<artifactId>nutzboot-starter-freemarker</artifactId>
<version>${nutzboot-version}</version>
<artifactId>nutzboot-starter-jetty</artifactId>
</dependency>
<!-- mysql驱动 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.40</version>
<groupId>org.nutz</groupId>
<artifactId>nutzboot-starter-nutz-mvc</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<groupId>org.nutz</groupId>
<artifactId>nutzboot-starter-shiro</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.21</version>
<scope>test</scope>
<groupId>org.nutz</groupId>
<artifactId>nutzboot-starter-freemarker</artifactId>
</dependency>
<!-- mysql驱动 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.44</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.1.5</version>
</dependency>
<!--<dependency>-->
<!--<groupId>org.freemarker</groupId>-->
<!--<artifactId>freemarker</artifactId>-->
<!--<version>2.3.26-incubating</version>-->
<!--</dependency>-->
<!--<dependency> -->
<!--<groupId>org.freemarker</groupId> -->
<!--<artifactId>freemarker</artifactId> -->
<!--<version>2.3.26-incubating</version> -->
<!--</dependency> -->

<dependency>
<groupId>org.t-io</groupId>
<artifactId>tio-websocket-server</artifactId>
<version>0.0.4-tio-websocket</version>
<version>0.0.8-tio-websocket</version>
</dependency>
<dependency>
<groupId>org.t-io</groupId>
<artifactId>tio-core</artifactId>
<version>2.0.2.v20171129-RELEASE</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>2.10.2</version>
</dependency>

<!--<dependency>-->
<!--<groupId>org.nutz</groupId>-->
<!--<artifactId>nutz-plugins-daocache</artifactId>-->
<!--<version>1.r.57</version>-->
<!--</dependency>-->
<!--<dependency> -->
<!--<groupId>org.nutz</groupId> -->
<!--<artifactId>nutz-plugins-daocache</artifactId> -->
<!--<version>1.r.57</version> -->
<!--</dependency> -->

<!--<dependency>-->
<!--<groupId>org.nutz</groupId>-->
<!--<artifactId>nutz-plugins-views</artifactId>-->
<!--<version>1.r.63.r5</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.nutz</groupId>-->
<!--<artifactId>nutz-integration-shiro</artifactId>-->
<!--<version>1.r.60</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.shiro</groupId>-->
<!--<artifactId>shiro-all</artifactId>-->
<!--<version>1.4.0</version>-->
<!--<exclusions>-->
<!--<exclusion>-->
<!--<artifactId>ehcache-core</artifactId>-->
<!--<groupId>net.sf.ehcache</groupId>-->
<!--</exclusion>-->
<!--</exclusions>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.shiro</groupId>-->
<!--<artifactId>shiro-core</artifactId>-->
<!--<version>1.4.0</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.shiro</groupId>-->
<!--<artifactId>shiro-web</artifactId>-->
<!--<version>1.4.0</version>-->
<!--</dependency>-->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.3</version>
</dependency>
<!--<dependency> -->
<!--<groupId>org.nutz</groupId> -->
<!--<artifactId>nutz-plugins-views</artifactId> -->
<!--<version>1.r.63.r5</version> -->
<!--</dependency> -->
<!--<dependency> -->
<!--<groupId>org.nutz</groupId> -->
<!--<artifactId>nutz-integration-shiro</artifactId> -->
<!--<version>1.r.60</version> -->
<!--</dependency> -->
<!--<dependency> -->
<!--<groupId>org.apache.shiro</groupId> -->
<!--<artifactId>shiro-all</artifactId> -->
<!--<version>1.4.0</version> -->
<!--<exclusions> -->
<!--<exclusion> -->
<!--<artifactId>ehcache-core</artifactId> -->
<!--<groupId>net.sf.ehcache</groupId> -->
<!--</exclusion> -->
<!--</exclusions> -->
<!--</dependency> -->
<!--<dependency> -->
<!--<groupId>org.apache.shiro</groupId> -->
<!--<artifactId>shiro-core</artifactId> -->
<!--<version>1.4.0</version> -->
<!--</dependency> -->
<!--<dependency> -->
<!--<groupId>org.apache.shiro</groupId> -->
<!--<artifactId>shiro-web</artifactId> -->
<!--<version>1.4.0</version> -->
<!--</dependency> -->

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>

<!--<dependency>-->
<!--<groupId>org.springframework</groupId>-->
<!--<artifactId>spring-aop</artifactId>-->
<!--<version>4.3.12.RELEASE</version>-->
<!--</dependency>-->
<!--<dependency> -->
<!--<groupId>org.springframework</groupId> -->
<!--<artifactId>spring-aop</artifactId> -->
<!--<version>4.3.12.RELEASE</version> -->
<!--</dependency> -->

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
</dependencies>
<build>
<finalName>lulichat</finalName>
@@ -151,6 +143,30 @@
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/nutz/org.nutz.boot.starter.NbStarter</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.dd.MainLauncher</mainClass>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

14 changes: 14 additions & 0 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
jetty.port=8081
jetty.host=0.0.0.0

shiro.ini.path=shiro.ini

#数据库配置
db.url=jdbc:mysql://127.0.0.1:3306/mychat?useOldAliasMetadataBehavior=true&useUnicode=true&characterEncoding=utf8
db.username=root
db.password=woailuli
db.validationQuery=select 1
db.maxActive=100

#socket配置
websocket.port=5210
6 changes: 0 additions & 6 deletions src/main/resources/config/db.properties

This file was deleted.

760 changes: 0 additions & 760 deletions src/main/webapp/layim-v3.7.5/dist/lay/modules/layim.js

This file was deleted.

0 comments on commit b72972c

Please sign in to comment.