Commit e314b16b authored by 李良停's avatar 李良停

llt

parent a8c69dbb
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.settings .settings
/.idea/ /.idea/
*.jar
*.war *.war
*.ear *.ear
......
...@@ -63,83 +63,16 @@ ...@@ -63,83 +63,16 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.sh.chineseall</groupId> <groupId>commons-io</groupId>
<artifactId>alpha-framework-api</artifactId> <artifactId>commons-io</artifactId>
</dependency> <version>2.5</version>
<dependency>
<groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-springboot-bootstrap</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-api</artifactId>
<version>${alpha-framework-version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-springboot-bootstrap</artifactId>
<version>${alpha-framework-version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-core</artifactId>
<version>${alpha-framework-version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-dao-mongo</artifactId>
<version>${alpha-framework-version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-springboot-starter</artifactId>
<version>${alpha-framework-version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
...@@ -210,11 +143,7 @@ ...@@ -210,11 +143,7 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-storage</artifactId>
<version>${alpha-framework-version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.quartz-scheduler</groupId> <groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId> <artifactId>quartz</artifactId>
...@@ -255,6 +184,9 @@ ...@@ -255,6 +184,9 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<includeSystemScope>true</includeSystemScope>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
...@@ -271,21 +203,25 @@ ...@@ -271,21 +203,25 @@
<target>1.8</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webResources>
<resource>
<directory>lib/</directory>
<targetPath>WEB-INF/lib</targetPath>
<includes>
<include>**/*.jar</include>
</includes>
</resource>
</webResources>
</configuration>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
<repositories>
<repository>
<id>public</id>
<url>http://180.167.91.206:5716/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
<checksumPolicy>warn</checksumPolicy>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
</project> </project>
\ No newline at end of file
...@@ -14,18 +14,10 @@ ...@@ -14,18 +14,10 @@
<dependencies> <dependencies>
<dependency>
<groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-springboot-starter</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId> <artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency> </dependency>
<dependency>
<groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
...@@ -40,6 +32,45 @@ ...@@ -40,6 +32,45 @@
<artifactId>sh-authcenter-log</artifactId> <artifactId>sh-authcenter-log</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.commons.codec</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-springboot-bootstrap</artifactId>
<version>2.0.6.0014</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/alpha-framework-springboot-bootstrap-2.0.6.0014.jar</systemPath>
</dependency>
<dependency>
<groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-springboot-starter</artifactId>
<version>2.0.6.0014</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/alpha-framework-springboot-starter-2.0.6.0014.jar</systemPath>
</dependency>
<dependency>
<groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-api</artifactId>
<version>2.0.6.0014</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/alpha-framework-api-2.0.6.0014.jar</systemPath>
</dependency>
<dependency>
<groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-core</artifactId>
<version>2.0.6.0014</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/alpha-framework-core-2.0.6.0014.jar</systemPath>
</dependency>
<!--因配置外部TOMCAT 而配置--> <!--因配置外部TOMCAT 而配置-->
<dependency> <dependency>
......
...@@ -11,11 +11,12 @@ import com.chineseall.authcenter.agent.utils.CookiesUtil; ...@@ -11,11 +11,12 @@ import com.chineseall.authcenter.agent.utils.CookiesUtil;
import com.chineseall.authcenter.agent.utils.EncodeUtil; import com.chineseall.authcenter.agent.utils.EncodeUtil;
import com.chineseall.authcenter.log.enums.LogType; import com.chineseall.authcenter.log.enums.LogType;
import com.chineseall.authcenter.log.model.AuthLog; import com.chineseall.authcenter.log.model.AuthLog;
import com.chineseall.authcenter.log.service.AuthLogService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.chineseall.authcenter.log.service.AuthLogService;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
......
...@@ -12,10 +12,6 @@ ...@@ -12,10 +12,6 @@
<artifactId>sh-authcenter-log</artifactId> <artifactId>sh-authcenter-log</artifactId>
<dependencies> <dependencies>
<dependency>
<groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-springboot-starter</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId> <artifactId>spring-boot-starter-thymeleaf</artifactId>
...@@ -27,17 +23,43 @@ ...@@ -27,17 +23,43 @@
<dependency> <dependency>
<groupId>cn.sh.chineseall</groupId> <groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-dao-core</artifactId> <artifactId>alpha-framework-dao-core</artifactId>
<version>${alpha-framework-version}</version> <version>2.0.6.0014</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/alpha-framework-dao-core-2.0.6.0014.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.sh.chineseall</groupId> <groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-dao-mongo</artifactId> <artifactId>alpha-framework-dao-mongo</artifactId>
<version>${alpha-framework-version}</version> <version>2.0.6.0014</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/alpha-framework-dao-mongo-2.0.6.0014.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.sh.chineseall</groupId> <groupId>cn.sh.chineseall</groupId>
<artifactId>alpha-framework-dao-mysql</artifactId> <artifactId>alpha-framework-cache-core</artifactId>
<version>${alpha-framework-version}</version> <version>2.0.6.0014</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/alpha-framework-cache-core-2.0.6.0014.jar</systemPath>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
<version>3.2.2</version>
</dependency>
<dependency>
<groupId>de.undercouch</groupId>
<artifactId>bson4jackson</artifactId>
<version>2.7.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<type>jar</type>
</dependency> </dependency>
</dependencies> </dependencies>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment