Browse Source

profile update

shjung 3 years ago
parent
commit
62e4e071cc

+ 1 - 1
pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.4.RELEASE</version>
+        <version>2.4.13</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.its</groupId>

+ 0 - 1
src/main/java/com/its/gits/service/UnitSystService.java

@@ -35,7 +35,6 @@ public class UnitSystService {
     private String processId;
     private final UnitSystMapper unitSystMapper;
 
-    private final UnitSystVo unitSyst = new UnitSystVo();
     private final UnitSystSttsVo unitSystStts = new UnitSystSttsVo();
     private final ConcurrentHashMap<String, UnitSystVo> unitSystMap = new ConcurrentHashMap<>();
 

+ 1 - 1
src/main/java/com/its/gits/webapp/config/WebSecurityConfig.java

@@ -1,6 +1,6 @@
 package com.its.gits.webapp.config;
 
-import com.its.gits.webapp.config.service.UserService;
+import com.its.gits.webapp.service.UserService;
 import com.its.gits.webapp.security.SessionListener;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

+ 1 - 1
src/main/java/com/its/gits/webapp/controller/WebAppCommonController.java

@@ -3,7 +3,7 @@ package com.its.gits.webapp.controller;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.its.app.utils.Ping;
 import com.its.gits.config.ServerConfig;
-import com.its.gits.webapp.config.service.FileService;
+import com.its.gits.webapp.service.FileService;
 import com.its.gits.webapp.vo.FileInfoVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.Resource;

+ 1 - 1
src/main/java/com/its/gits/webapp/controller/WebAppController.java

@@ -5,7 +5,7 @@ import com.its.gits.config.ServerConfig;
 import com.its.gits.repository.AppRepository;
 import com.its.gits.service.GgIncdService;
 import com.its.gits.vo.GgIncdOcrrVo;
-import com.its.gits.webapp.config.service.FileService;
+import com.its.gits.webapp.service.FileService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.stereotype.Controller;

+ 1 - 1
src/main/java/com/its/gits/webapp/security/UserAuthenticationProvider.java

@@ -1,6 +1,6 @@
 package com.its.gits.webapp.security;
 
-import com.its.gits.webapp.config.service.UserService;
+import com.its.gits.webapp.service.UserService;
 import com.its.gits.webapp.vo.UserVo;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.BadCredentialsException;

+ 1 - 1
src/main/java/com/its/gits/webapp/config/service/FileService.java → src/main/java/com/its/gits/webapp/service/FileService.java

@@ -1,4 +1,4 @@
-package com.its.gits.webapp.config.service;
+package com.its.gits.webapp.service;
 
 import com.its.app.utils.OS;
 import com.its.gits.webapp.vo.FileInfoVo;

+ 1 - 1
src/main/java/com/its/gits/webapp/config/service/UserService.java → src/main/java/com/its/gits/webapp/service/UserService.java

@@ -1,4 +1,4 @@
-package com.its.gits.webapp.config.service;
+package com.its.gits.webapp.service;
 
 import com.its.gits.webapp.vo.UserVo;
 import org.springframework.beans.factory.annotation.Value;

+ 6 - 2
src/main/resources/application.yml

@@ -41,7 +41,9 @@ spring:
 
 ---
 spring:
-  profiles: dev
+  config:
+    activate:
+      on-profile: dev
   datasource:
     hikari:
       driver-class-name: com.tmax.tibero.jdbc.TbDriver
@@ -57,7 +59,9 @@ spring:
 
 ---
 spring:
-  profiles: prod
+  config:
+    activate:
+      on-profile: prod
   datasource:
     hikari:
       driver-class-name: com.tmax.tibero.jdbc.TbDriver

+ 0 - 0
src/main/resources/mybatis/mapper/UnitSyst.xml → src/main/resources/mybatis/mapper/UnitSystMapper.xml