Compare commits

..

27 Commits

Author SHA1 Message Date
jangwonseokicom 9c7d364c84 메뉴구조 1.2버전 적용 2 years ago
jangwonseokicom 49ee2b554e 메뉴구조 1.2버전 적용 2 years ago
kkw29 0651b8eff3 html 파일 전환 2 years ago
jangwonseokicom 961f79a1ed 구조작업 상담가이드 2 years ago
jangwonseokicom ebce720901 Merge remote-tracking branch 'origin/dev_tymeleaf' into dev_tymeleaf 2 years ago
jangwonseokicom ab344cdd76 구조작업 2 years ago
jangwonseok 92ed9256e0 로그기록 일시 삭제 2 years ago
jangwonseokicom 38eeb6e446 메뉴구조 변경 2 years ago
jangwonseokicom 077dd8266c 토큰 일부 적용 url변경중 2 years ago
jangwonseokicom 8e85e2d32d 토큰 일부 적용 url변경중 2 years ago
jangwonseokicom dfea91edc8 spa식으로 변경 2 years ago
jangwonseokicom 24ba911482 시스템 관리 jsp 의존성 제거 2 years ago
jangwonseokicom 75d1b3b423 html jsp 제거 2 years ago
jangwonseokicom 3d63f2e538 메뉴 lnb jsp제거 2 years ago
jangwonseokicom c8617b3345 컨피그 수정 2 years ago
jangwonseokicom 160f5135f5 Merge branch 'dev_tymeleaf' of http://git.icomsys.co.kr/JANGWONSEOK/cinnamon-ui-v2 into dev_tymeleaf
# Conflicts:
#	.gitignore
2 years ago
kkw29 a588ca3f59 JWT 작업중 2 years ago
jangwonseokicom bb91d6fe7e ignore add 2 years ago
jangwonseokicom 4c89e1d524 thymeleaf convert complate 2 years ago
jangwonseokicom 8a6d69bbf6 thymeleaf convert complate 2 years ago
jangwonseokicom 2058c43ba8 page dash borad css!! 2 years ago
jangwonseokicom b0ef466826 page randering clear 2 years ago
jangwonseokicom 12880e8b5f thymeleaf ssr complate 2 years ago
jangwonseokicom a8ddf60848 thymeleaf template change complate 2 years ago
jangwonseokicom 43ad473107 db정보 업데이트 2 years ago
jangwonseokicom 4c3a5bdfda 권한수정 2 years ago
jangwonseokicom 029911940b 메뉴추가 2 years ago

43
.gitignore vendored

@ -0,0 +1,43 @@
HELP.md
.gradle
.idea
build/
**/.gradle
**/.idea
**/build
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/
### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
out/
!**/src/main/**/out/
!**/src/test/**/out/
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
### VS Code ###
.vscode/

@ -4,7 +4,7 @@
<component name="FrameworkDetectionExcludesConfiguration"> <component name="FrameworkDetectionExcludesConfiguration">
<file type="web" url="file://$PROJECT_DIR$/main_vm" /> <file type="web" url="file://$PROJECT_DIR$/main_vm" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="corretto-17" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="$PROJECT_DIR$" vcs="Git" />
</component> </component>
</project> </project>

@ -0,0 +1,2 @@
#Wed May 17 16:48:27 KST 2023
gradle.version=7.5.1

Binary file not shown.

@ -0,0 +1,8 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="accountSettings">
<option name="activeRegion" value="us-east-1" />
<option name="recentlyUsedRegions">
<list>
<option value="us-east-1" />
</list>
</option>
</component>
</project>

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile name="Gradle Imported" enabled="true">
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="false">
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.24/13a394eed5c4f9efb2a6d956e2086f1d81e857d9/lombok-1.18.24.jar" />
</processorPath>
<module name="main_vm.main" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel target="11" />
</component>
</project>

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</GradleProjectSettings>
</option>
</component>
</project>

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="MavenRepo" />
<option name="name" value="MavenRepo" />
<option name="url" value="https://repo.maven.apache.org/maven2/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven2" />
<option name="name" value="maven2" />
<option name="url" value="https://maven.egovframe.go.kr/maven/" />
</remote-repository>
</component>
</project>

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="FrameworkDetectionExcludesConfiguration">
<file type="web" url="file://$PROJECT_DIR$" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
</project>

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
</component>
</project>

@ -1,6 +1,6 @@
plugins { plugins {
id 'org.springframework.boot' version '2.7.6' id 'org.springframework.boot' version '2.7.6'
id "org.sonarqube" version "2.7" // id "org.sonarqube" version "2.7"
id 'io.spring.dependency-management' version '1.0.14.RELEASE' id 'io.spring.dependency-management' version '1.0.14.RELEASE'
id 'java' id 'java'
id 'com.ewerk.gradle.plugins.querydsl' version '1.0.10' id 'com.ewerk.gradle.plugins.querydsl' version '1.0.10'
@ -9,7 +9,7 @@ plugins {
group = 'com.icom' group = 'com.icom'
version = '0.0.1-SNAPSHOT' version = '0.0.1-SNAPSHOT'
sourceCompatibility = '11' sourceCompatibility = '11'
//sourceCompatibility = '1.8' /*
apply plugin: 'war' apply plugin: 'war'
configurations { configurations {
compileOnly { compileOnly {
@ -30,25 +30,34 @@ repositories {
} }
} }
} }
*/
//repositories { repositories {
// mavenCentral() mavenCentral()
// maven { url "https://maven.egovframe.go.kr/maven/" } // egovframe maven }
//} /*
ext { ext {
set('springCloudVersion', "2021.0.4") set('springCloudVersion', "2021.0.4")
set('log4j2.version', "2.17.1") // log4j set('log4j2.version', "2.17.1") // log4j
} }
*/
ext {
set('springCloudVersion', "2021.0.4")
}
dependencies { dependencies {
/*
implementation 'org.egovframe.cloud:module-common:0.1' implementation 'org.egovframe.cloud:module-common:0.1'
implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.0.0') { implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.0.0') {
exclude group: 'org.egovframe.rte', module: 'org.egovframe.rte.fdl.logging' exclude group: 'org.egovframe.rte', module: 'org.egovframe.rte.fdl.logging'
} }
*/
implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect'
implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5'
implementation 'org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.4.RELEASE'
implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-validation'
@ -71,35 +80,36 @@ dependencies {
implementation 'com.querydsl:querydsl-sql-spring:5.0.0' implementation 'com.querydsl:querydsl-sql-spring:5.0.0'
implementation 'com.querydsl:querydsl-sql-codegen:5.0.0' implementation 'com.querydsl:querydsl-sql-codegen:5.0.0'
implementation 'org.apache.tomcat:tomcat-jdbc:10.1.1' // implementation 'javax.servlet:javax.servlet-api'
implementation 'javax.servlet:javax.servlet-api'
implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'org.apache.poi:poi:5.2.2'
implementation 'org.apache.poi:poi-ooxml:5.2.2'
implementation 'software.amazon.awssdk:s3:2.16.1' implementation 'software.amazon.awssdk:s3:2.16.1'
//
implementation 'commons-codec:commons-codec:1.15' implementation 'commons-codec:commons-codec:1.15'
implementation 'org.apache.commons:commons-text:1.8'
implementation 'org.apache.commons:commons-lang3:3.10'
implementation 'org.apache.poi:poi:5.2.2'
implementation 'org.apache.poi:poi-ooxml:5.2.2'
implementation 'org.apache.tomcat:tomcat-jdbc:10.1.1'
implementation 'org.apache.httpcomponents:httpclient:4.5.14'
//
// implementation group: 'commons-logging', name: 'commons-logging', version: '1.2' // implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
// implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.4.5' // implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.4.5'
// testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.5' // testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.5'
// implementation group: 'org.slf4j', name: 'jcl-over-slf4j', version: '2.0.6' // implementation group: 'org.slf4j', name: 'jcl-over-slf4j', version: '2.0.6'
//jsp //jsp
implementation 'org.apache.tomcat.embed:tomcat-embed-jasper' // implementation 'org.apache.tomcat.embed:tomcat-embed-jasper'
implementation 'javax.servlet:jstl' // implementation 'javax.servlet:jstl'
providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat' // providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
testImplementation 'org.springframework.boot:spring-boot-starter-test' // testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.security:spring-security-test' // testImplementation 'org.springframework.security:spring-security-test'
implementation 'net.jodah:expiringmap:0.5.9' // implementation 'net.jodah:expiringmap:0.5.9'
// https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient // https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient
implementation 'org.apache.httpcomponents:httpclient:4.5.14'
compileOnly 'org.projectlombok:lombok' compileOnly 'org.projectlombok:lombok'
@ -119,6 +129,14 @@ dependencies {
implementation files("lib/ASRLIB-2.4.0.2.jar") implementation files("lib/ASRLIB-2.4.0.2.jar")
implementation files("lib/pttsnet_class.jar") implementation files("lib/pttsnet_class.jar")
// jwt
implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
//
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
} }
tasks.named('test') { tasks.named('test') {
@ -132,6 +150,7 @@ dependencyManagement {
} }
} }
// querydsl // querydsl
def querydslDir = "$buildDir/generated/querydsl" def querydslDir = "$buildDir/generated/querydsl"
//def querydslDir = "src/main/qfile" //def querydslDir = "src/main/qfile"

@ -0,0 +1 @@
com.icomsys.main_vm.MainVmApplication

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save