Skip to content

T
tagManager
Commit e7e71201 by linxu
Options

refactor

parent 8e440779
Showing with 63 additions and 268 deletions
pom.xml
...@@ -13,103 +13,68 @@ ...@@ -13,103 +13,68 @@
<description>tagManager</description> <description>tagManager</description>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>com.keymobile.sdrcb</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>ngdb-starter</artifactId>
<version>2.0.4.RELEASE</version> <version>1.0.0-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent> </parent>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<docker.image.prefix>springio</docker.image.prefix>
<druid.version>1.0.29</druid.version>
<fastjson.version>1.2.70</fastjson.version> <fastjson.version>1.2.70</fastjson.version>
<spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
<easypoi.version>4.1.3</easypoi.version> <easypoi.version>4.1.3</easypoi.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.github.ulisesbocchio</groupId> <groupId>com.keymobile.sdrcb</groupId>
<artifactId>jasypt-spring-boot-starter</artifactId> <artifactId>feign-core-naive</artifactId>
<version>3.0.3</version> <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>com.keymobile.sdrcb</groupId>
<artifactId>spring-boot-starter-data-elasticsearch</artifactId> <artifactId>common-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>3.7</version> <version>3.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>2.5.0</version> <version>2.7.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>springfox-swagger-ui</artifactId>
<version>2.5.0</version> <version>2.7.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>${fastjson.version}</version> <version>${fastjson.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-data-redis</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config-client</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.dom4j</groupId> <groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId> <artifactId>dom4j</artifactId>
<version>2.1.0</version> <version>2.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>20.0</version> <version>20.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.antlr</groupId> <groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId> <artifactId>antlr4-runtime</artifactId>
...@@ -117,24 +82,12 @@ ...@@ -117,24 +82,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>redis.clients</groupId> <groupId>redis.clients</groupId>
<artifactId>jedis</artifactId> <artifactId>jedis</artifactId>
<version>2.9.0</version> <version>2.9.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.6</version>
</dependency>
<!-- 引入easypoi -->
<dependency>
<groupId>cn.afterturn</groupId> <groupId>cn.afterturn</groupId>
<artifactId>easypoi-base</artifactId> <artifactId>easypoi-base</artifactId>
<version>${easypoi.version}</version> <version>${easypoi.version}</version>
...@@ -149,100 +102,20 @@ ...@@ -149,100 +102,20 @@
<artifactId>easypoi-annotation</artifactId> <artifactId>easypoi-annotation</artifactId>
<version>${easypoi.version}</version> <version>${easypoi.version}</version>
</dependency> </dependency>
<!-- 引入easypoi -->
<dependency>
<groupId>auth</groupId>
<artifactId>auth-common</artifactId>
<scope>system</scope>
<systemPath>${project.basedir}/lib/auth-common-2.0.0.jar</systemPath>
<version>1.0.2</version>
</dependency>
<!-- cas相关 -->
<dependency>
<groupId>com.kakawait</groupId>
<artifactId>cas-security-spring-boot-starter</artifactId>
<version>1.0.0-beta-1</version>
</dependency>
<!-- gson -->
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-bom</artifactId>
<version>${spring-security.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build> <build>
<resources>
<resource>
<directory>lib</directory>
<targetPath>BOOT-INF/lib/</targetPath>
<includes>
<include>**/*.jar</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>*.yml</include>
<include>**/*.xml</include>
</includes>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.13</version>
<configuration>
<imageName>${docker.image.prefix}/${project.artifactId}</imageName>
<dockerDirectory>src/main/docker</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>${project.build.finalName}.jar</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
<repositories>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
</project> </project>
settings.xml 0 → 100644
<settings>
<mirrors>
<mirror>
<id>nexus</id>
<mirrorOf>*</mirrorOf>
<url>http://mgr-00:8081/repository/maven-public/</url>
</mirror>
</mirrors>
<servers>
<server>
<id>nexus-snapshots</id>
<username>admin</username>
<password>dataSharing</password>
</server>
<server>
<id>nexus-releases</id>
<username>admin</username>
<password>dataSharing</password>
</server>
</servers>
</settings>
\ No newline at end of file
src/main/java/com/keymobile/tagmanager/api/ExcelParser.java
...@@ -5,7 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ImportParams; ...@@ -5,7 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
import com.keymobile.tagmanager.logging.LogConstants; import com.keymobile.tagmanager.logging.LogConstants;
import com.keymobile.tagmanager.logging.LogManager; import com.keymobile.common.logging.LogManager;
import com.keymobile.tagmanager.model.SysTag; import com.keymobile.tagmanager.model.SysTag;
import com.keymobile.tagmanager.model.system.SysApplication; import com.keymobile.tagmanager.model.system.SysApplication;
import com.keymobile.tagmanager.model.system.SysConstruction; import com.keymobile.tagmanager.model.system.SysConstruction;
......
src/main/java/com/keymobile/tagmanager/api/TagCtrl.java
...@@ -15,10 +15,10 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -15,10 +15,10 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.keymobile.auth.common.security.GrantedAuthHelper; import com.keymobile.common.security.GrantedAuthHelper;
import com.keymobile.tagmanager.exception.TagNotExistException; import com.keymobile.tagmanager.exception.TagNotExistException;
import com.keymobile.tagmanager.logging.LogConstants; import com.keymobile.tagmanager.logging.LogConstants;
import com.keymobile.tagmanager.logging.LogManager; import com.keymobile.common.logging.LogManager;
import com.keymobile.tagmanager.model.ExtTag; import com.keymobile.tagmanager.model.ExtTag;
import com.keymobile.tagmanager.model.Page; import com.keymobile.tagmanager.model.Page;
import com.keymobile.tagmanager.model.SysTag; import com.keymobile.tagmanager.model.SysTag;
......
src/main/java/com/keymobile/tagmanager/api/TagFileCtrl.java
...@@ -15,9 +15,9 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -15,9 +15,9 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.keymobile.auth.common.security.GrantedAuthHelper; import com.keymobile.common.security.GrantedAuthHelper;
import com.keymobile.tagmanager.logging.LogConstants; import com.keymobile.tagmanager.logging.LogConstants;
import com.keymobile.tagmanager.logging.LogManager; import com.keymobile.common.logging.LogManager;
import com.keymobile.tagmanager.model.Page; import com.keymobile.tagmanager.model.Page;
import com.keymobile.tagmanager.service.TagFileService; import com.keymobile.tagmanager.service.TagFileService;
import com.keymobile.tagmanager.util.UserInfoUtils; import com.keymobile.tagmanager.util.UserInfoUtils;
......
src/main/java/com/keymobile/tagmanager/api/TagRelCtrl.java
...@@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.PostMapping; ...@@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.keymobile.auth.common.security.GrantedAuthHelper; import com.keymobile.common.security.GrantedAuthHelper;
import com.keymobile.tagmanager.logging.LogConstants; import com.keymobile.tagmanager.logging.LogConstants;
import com.keymobile.tagmanager.logging.LogManager; import com.keymobile.common.logging.LogManager;
import com.keymobile.tagmanager.model.TagRelation; import com.keymobile.tagmanager.model.TagRelation;
import com.keymobile.tagmanager.service.TagRelService; import com.keymobile.tagmanager.service.TagRelService;
import com.keymobile.tagmanager.util.UserInfoUtils; import com.keymobile.tagmanager.util.UserInfoUtils;
......
src/main/java/com/keymobile/tagmanager/config/SecurityConfig.java
...@@ -2,7 +2,7 @@ package com.keymobile.tagmanager.config; ...@@ -2,7 +2,7 @@ package com.keymobile.tagmanager.config;
import javax.sql.DataSource; import javax.sql.DataSource;
import com.keymobile.auth.common.security.CustomizedUserDetailService; import com.keymobile.common.security.CustomizedUserDetailService;
import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
...@@ -18,7 +18,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; ...@@ -18,7 +18,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
@Configuration @Configuration
@EnableWebSecurity @EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true) @EnableGlobalMethodSecurity(prePostEnabled = true)
@ComponentScan("com.keymobile.auth.common.security") @ComponentScan("com.keymobile.common.security")
public class SecurityConfig extends WebSecurityConfigurerAdapter { public class SecurityConfig extends WebSecurityConfigurerAdapter {
......
src/main/java/com/keymobile/tagmanager/logging/LogManager.java deleted 100644 → 0
package com.keymobile.tagmanager.logging;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class LogManager {
public static void logTrace(String context, Throwable e, String message) {
Logger logger = LoggerFactory.getLogger(context);
if (logger.isTraceEnabled()) {
logger.trace(message, e);
}
}
public static void logTrace(String context, String message) {
logTrace(context, null, message);
}
public static void logDebug(String context, String message) {
Logger logger = LoggerFactory.getLogger(context);
if (logger.isDebugEnabled()) {
logger.debug(message);
}
}
public static void logInfo(String context, String message) {
Logger logger = LoggerFactory.getLogger(context);
if (logger.isInfoEnabled()) {
logger.info(message);
}
}
public static void logWarning(String context, Throwable e, String message) {
Logger logger = LoggerFactory.getLogger(context);
if (logger.isWarnEnabled()) {
logger.warn(message, e);
}
}
public static void logWarning(String context, String message) {
logWarning(context, null, message);
}
public static void logError(String context, Throwable e, String message) {
Logger logger = LoggerFactory.getLogger(context);
if (logger.isErrorEnabled()) {
logger.error(message, e);
}
}
public static void logError(String context, String message) {
logError(context, message);
}
}
src/main/java/com/keymobile/tagmanager/logging/MdcLogEnhancerFilter.java deleted 100644 → 0
package com.keymobile.tagmanager.logging;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Component;
import org.slf4j.MDC;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import javax.servlet.*;
import java.io.IOException;
@Component
public class MdcLogEnhancerFilter implements Filter {
@Override
public void destroy() {
}
@Override
public void init(FilterConfig filterConfig) throws ServletException {
}
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException
{
MDC.put("user", getUser());
MDC.put("session", getSession());
filterChain.doFilter(servletRequest, servletResponse);
}
private String getUser() {
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
String userName = "NO_USER";
if (auth != null) {
userName = auth.getName();
}
return userName;
}
private String getSession() {
RequestAttributes attrs = RequestContextHolder.getRequestAttributes();
String session = "NO_SESSION";
if (attrs != null) {
session = attrs.getSessionId();
}
return session;
}
}
src/main/java/com/keymobile/tagmanager/service/TagFileService.java
...@@ -39,7 +39,7 @@ import org.springframework.data.mongodb.core.query.Query; ...@@ -39,7 +39,7 @@ import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.keymobile.auth.common.security.GrantedAuthHelper; import com.keymobile.common.security.GrantedAuthHelper;
import com.keymobile.tagmanager.model.ImportLog; import com.keymobile.tagmanager.model.ImportLog;
import com.keymobile.tagmanager.model.Page; import com.keymobile.tagmanager.model.Page;
import com.keymobile.tagmanager.model.SysTag; import com.keymobile.tagmanager.model.SysTag;
......
src/main/java/com/keymobile/tagmanager/service/TagService.java
...@@ -24,7 +24,7 @@ import org.springframework.data.mongodb.core.query.Criteria; ...@@ -24,7 +24,7 @@ import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.keymobile.auth.common.security.GrantedAuthHelper; import com.keymobile.common.security.GrantedAuthHelper;
import com.keymobile.tagmanager.exception.TagDuplicateException; import com.keymobile.tagmanager.exception.TagDuplicateException;
import com.keymobile.tagmanager.exception.TagException; import com.keymobile.tagmanager.exception.TagException;
import com.keymobile.tagmanager.exception.TagNotExistException; import com.keymobile.tagmanager.exception.TagNotExistException;
......
src/main/resources/application.properties
jasypt.encryptor.algorithm=PBEWithMD5AndDES application.code=whatever
jasypt.encryptor.iv-generator-classname=org.jasypt.iv.NoIvGenerator #management.endpoint.health.show-details=always
\ No newline at end of file run.mode=DEV
com.alipay.env=shared
com.alipay.instanceid=GGR3SMJXTNZB
com.antcloud.antvip.endpoint=139.0.236.5
com.antcloud.mw.access=ACgYoMcAHo4vPMJU
com.antcloud.mw.secret=Wi2JaDa6M4xUdtReyPTHiCbPeFcMs9bt
\ No newline at end of file
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