somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

소스 충돌파일 재 커밋

Browse Source
This commit is contained in:
JSYOO 2021-07-21 09:42:00 +09:00
parent 5c1609ea87
commit 6089b957bd
4 changed files with 133 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

209
pom.xml
View File

@ -1,114 +1,114 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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> <modelVersion>4.0.0</modelVersion>
<groupId>nlib</groupId> <groupId>nlib</groupId>
<artifactId>nlib</artifactId> <artifactId>nlib</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>1.0.0</version> <version>1.0.0</version>
<name>nlib</name> <name>nlib</name>
<url>http://www.egovframe.go.kr</url> <url>http://www.egovframe.go.kr</url>
<licenses> <licenses>
<license> <license>
<name>The Apache Software License, Version 2.0</name> <name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license> </license>
</licenses> </licenses>
<properties> <properties>
<spring.maven.artifact.version>4.3.16.RELEASE</spring.maven.artifact.version> <spring.maven.artifact.version>4.3.16.RELEASE</spring.maven.artifact.version>
<egovframework.rte.version>3.8.0</egovframework.rte.version> <egovframework.rte.version>3.8.0</egovframework.rte.version>
<spring-security.version>4.2.5.RELEASE</spring-security.version> <spring-security.version>4.2.5.RELEASE</spring-security.version>
</properties> </properties>
<repositories> <repositories>
<repository> <repository>
<id>mvn2</id> <id>mvn2</id>
<url>http://repo1.maven.org/maven2/</url> <url>http://repo1.maven.org/maven2/</url>
<releases> <releases>
<enabled>true</enabled> <enabled>true</enabled>
</releases> </releases>
<snapshots> <snapshots>
<enabled>true</enabled> <enabled>true</enabled>
</snapshots> </snapshots>
</repository> </repository>
<repository> <repository>
<id>egovframe</id> <id>egovframe</id>
<url>http://www.egovframe.go.kr/maven/</url> <url>http://www.egovframe.go.kr/maven/</url>
<releases> <releases>
<enabled>true</enabled> <enabled>true</enabled>
</releases> </releases>
<snapshots> <snapshots>
<enabled>false</enabled> <enabled>false</enabled>
</snapshots> </snapshots>
</repository> </repository>
<repository> <repository>
<id>egovframe2</id> <id>egovframe2</id>
<url>http://maven.egovframe.kr:8080/maven/</url> <url>http://maven.egovframe.kr:8080/maven/</url>
<releases> <releases>
<enabled>true</enabled> <enabled>true</enabled>
</releases> </releases>
<snapshots> <snapshots>
<enabled>false</enabled> <enabled>false</enabled>
</snapshots> </snapshots>
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
<!-- 표준프레임워크 실행환경 --> <!-- 표준프레임워크 실행환경 -->
<dependency> <dependency>
<groupId>egovframework.rte</groupId> <groupId>egovframework.rte</groupId>
<artifactId>egovframework.rte.ptl.mvc</artifactId> <artifactId>egovframework.rte.ptl.mvc</artifactId>
<version>${egovframework.rte.version}</version> <version>${egovframework.rte.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>commons-logging</artifactId> <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>egovframework.rte</groupId> <groupId>egovframework.rte</groupId>
<artifactId>egovframework.rte.psl.dataaccess</artifactId> <artifactId>egovframework.rte.psl.dataaccess</artifactId>
<version>${egovframework.rte.version}</version> <version>${egovframework.rte.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>egovframework.rte</groupId> <groupId>egovframework.rte</groupId>
<artifactId>egovframework.rte.fdl.idgnr</artifactId> <artifactId>egovframework.rte.fdl.idgnr</artifactId>
<version>${egovframework.rte.version}</version> <version>${egovframework.rte.version}</version>
</dependency> </dependency>
<dependency>
<groupId>egovframework.rte</groupId>
<artifactId>egovframework.rte.fdl.property</artifactId>
<version>${egovframework.rte.version}</version>
</dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>egovframework.rte</groupId>
<artifactId>servlet-api</artifactId> <artifactId>egovframework.rte.fdl.property</artifactId>
<scope>provided</scope> <version>${egovframework.rte.version}</version>
<version>2.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId> <artifactId>servlet-api</artifactId>
<version>1.2</version> <scope>provided</scope>
<version>2.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>taglibs</groupId> <groupId>javax.servlet</groupId>
<artifactId>standard</artifactId> <artifactId>jstl</artifactId>
<version>1.1.2</version> <version>1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.antlr</groupId> <groupId>taglibs</groupId>
<artifactId>antlr</artifactId> <artifactId>standard</artifactId>
<version>3.5</version> <version>1.1.2</version>
</dependency> </dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr</artifactId>
<version>3.5</version>
</dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
@ -120,7 +120,7 @@
<artifactId>egovframework.rte.fdl.crypto</artifactId> <artifactId>egovframework.rte.fdl.crypto</artifactId>
<version>${egovframework.rte.version}</version> <version>${egovframework.rte.version}</version>
</dependency> </dependency>
<!-- fileupload --> <!-- fileupload -->
<dependency> <dependency>
<groupId>commons-fileupload</groupId> <groupId>commons-fileupload</groupId>
@ -190,7 +190,18 @@
<version>3.3.0</version> <version>3.3.0</version>
</dependency> </dependency>
<!-- ajax (DIGITALSHIP JSYOO 2021.07.12)-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.7.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.7.3</version>
</dependency>
<!-- Tiles (DIGITALSHIP KNKIM 2021.07.06)--> <!-- Tiles (DIGITALSHIP KNKIM 2021.07.06)-->
<dependency> <dependency>
<groupId>org.apache.tiles</groupId> <groupId>org.apache.tiles</groupId>
@ -225,26 +236,26 @@
<version>2.11.4</version> <version>2.11.4</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
<directory>${basedir}/target</directory> <directory>${basedir}/target</directory>
<finalName>${artifactId}-${version}</finalName> <finalName>${artifactId}-${version}</finalName>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.tomcat.maven</groupId> <groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId> <artifactId>tomcat7-maven-plugin</artifactId>
<version>2.2</version> <version>2.2</version>
<configuration> <configuration>
<port>80</port> <port>80</port>
<path>/</path> <path>/</path>
<systemProperties> <systemProperties>
<JAVA_OPTS>-Xms256m -Xmx768m -XX:MaxPermSize=256m</JAVA_OPTS> <JAVA_OPTS>-Xms256m -Xmx768m -XX:MaxPermSize=256m</JAVA_OPTS>
</systemProperties> </systemProperties>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>

4
src/main/java/nlib/security/SpringSecurityConfig.java
View File

@ -61,6 +61,10 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
http.authorizeRequests() http.authorizeRequests()
.antMatchers("/login/login*.do").permitAll() .antMatchers("/login/login*.do").permitAll()
.antMatchers("/login/logout*.do").permitAll() .antMatchers("/login/logout*.do").permitAll()
.antMatchers("/login/naver*.do").permitAll()
.antMatchers("/member/*.do").permitAll()
.antMatchers("/member/*.ajax").permitAll()
.antMatchers("/userInfo/*.do").permitAll()
.antMatchers("/info/inform/*.do").permitAll() .antMatchers("/info/inform/*.do").permitAll()
.antMatchers("/").permitAll() .antMatchers("/").permitAll()
.antMatchers("/index.jsp").permitAll() .antMatchers("/index.jsp").permitAll()

8
src/main/resources/nlib/nlib.properties
View File

@ -46,3 +46,11 @@ fileupload.temp.subpath = /temp
# \ubb3b\uace0\ub2f5\ud558\uae30 \uac8c\uc2dc\ud310 \uc11c\ube0c\uc704\uce58 : \ucca8\ubd80\ud30c\uc77c \ucd5c\uc0c1\uc704 \uc704\uce58 \uc774\ud558\uc758 \uc704\uce58 \uc815\ubcf4\ub97c \uc124\uc815 # \ubb3b\uace0\ub2f5\ud558\uae30 \uac8c\uc2dc\ud310 \uc11c\ube0c\uc704\uce58 : \ucca8\ubd80\ud30c\uc77c \ucd5c\uc0c1\uc704 \uc704\uce58 \uc774\ud558\uc758 \uc704\uce58 \uc815\ubcf4\ub97c \uc124\uc815
fileupload.bbs.qna.subpath = /bbs/qna fileupload.bbs.qna.subpath = /bbs/qna
# \uba54\uc77c \uacbd\ub85c
mailing.sender.membership.template = C:/iams/workspace/nlib/src/main/webapp/mail/mail_template.html
#\uba54\uc77c \ubcf4\ub0b4\ub294 \uc8fc\uc18c
mailing.sender.membership.email = no-reply@nlib.org
#\uba54\uc77c \ubcf4\ub0b4\ub294\uc0ac\ub78c \uc774\ub984
mailing.sender.membership.name = Nlib

12
src/main/webapp/WEB-INF/tiles/tiles-layout.xml
View File

@ -10,6 +10,11 @@
<put-attribute name="menu" value="/WEB-INF/tiles/inc/menu.jsp" /> <put-attribute name="menu" value="/WEB-INF/tiles/inc/menu.jsp" />
<put-attribute name="footer" value="/WEB-INF/tiles/inc/footer.jsp" /> <put-attribute name="footer" value="/WEB-INF/tiles/inc/footer.jsp" />
</definition> </definition>
<definition name="popup" template="/WEB-INF/tiles/tiles-layout-popup.jsp">
<put-attribute name="header" value="/WEB-INF/tiles/inc-popup/header.jsp" />
<put-attribute name="menu" value="/WEB-INF/tiles/inc-popup/menu.jsp" />
<put-attribute name="footer" value="/WEB-INF/tiles/inc-popup/footer.jsp" />
</definition>
<definition name="*" extends="template"> <definition name="*" extends="template">
<put-attribute name="main" value="/WEB-INF/jsp/{1}.jsp" /> <put-attribute name="main" value="/WEB-INF/jsp/{1}.jsp" />
@ -26,5 +31,10 @@
<definition name="*/*/*/*" extends="template"> <definition name="*/*/*/*" extends="template">
<put-attribute name="main" value="/WEB-INF/jsp/{1}/{2}/{3}/{4}.jsp" /> <put-attribute name="main" value="/WEB-INF/jsp/{1}/{2}/{3}/{4}.jsp" />
</definition> </definition>
<definition name="*/*Popup" extends="popup">
<put-attribute name="main" value="/WEB-INF/jsp/{1}/{2}*Popup.jsp" />
</definition>
<definition name="*/*/*Popup" extends="popup">
<put-attribute name="main" value="/WEB-INF/jsp/{1}/{2}/{3}*Popup.jsp" />
</definition>
</tiles-definitions> </tiles-definitions>