包名调整

bsoft-admin/src/main/java/com/bsoft/admin/common/aspect/TokenAspect.java

@@ -3,7 +3,7 @@ package com.bsoft.admin.common.aspect;
 import com.bsoft.admin.common.Constants;
 import com.bsoft.admin.common.exceptions.InvalidTokenException;
 import com.bsoft.admin.common.utils.TokenUtil;
-import com.bsoft.common.utils.StringUtil;
+import com.hs.common.utils.StringUtil;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;

bsoft-admin/src/main/java/com/bsoft/admin/common/resolvers/CurrentUserMethodArgumentResolver.java

@@ -4,7 +4,7 @@ import com.bsoft.admin.common.Constants;
 import com.bsoft.admin.common.annotations.CurrentUser;
 import com.bsoft.admin.common.utils.TokenUtil;
 import com.bsoft.admin.model.SysUser;
-import com.bsoft.common.utils.RedisUtil;
+import com.hs.common.utils.RedisUtil;
 import org.springframework.core.MethodParameter;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;

bsoft-admin/src/main/java/com/bsoft/admin/common/utils/TokenUtil.java

 package com.bsoft.admin.common.utils;
 
 import com.bsoft.admin.model.SysUser;
-import com.bsoft.common.utils.JWTUtil;
-import com.bsoft.common.utils.RedisUtil;
+import com.hs.common.utils.JWTUtil;
+import com.hs.common.utils.RedisUtil;
 
 public class TokenUtil {
     public final static long TOKEN_TIME_OUT = 72L * 60 * 60;

bsoft-admin/src/main/java/com/bsoft/admin/controller/LoginController.java

@@ -3,7 +3,7 @@ package com.bsoft.admin.controller;
 import com.bsoft.admin.common.Result;
 import com.bsoft.admin.model.reqmodel.CodeAndPwd;
 import com.bsoft.admin.service.LoginService;
-import com.bsoft.common.utils.HttpUtil;
+import com.hs.common.utils.HttpUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

bsoft-admin/src/test/resources/generatorConfig.xml

@@ -32,7 +32,7 @@
             <!-- 针对mysql数据库 获取字段注释 -->
 <!--            <property name="useInformationSchema" value="true"></property>-->
         </jdbcConnection>
-<!--        <javaTypeResolver type="com.bsoft.generator.JavaTypeResolverImpl"/>-->
+<!--        <javaTypeResolver type="JavaTypeResolverImpl"/>-->
         <!-- 生成实体类配置 -->
         <javaModelGenerator targetPackage="com.bsoft.admin.model" targetProject="src/main/java"/>
         <!-- 生成映射文件配置 -->

hs-api/pom.xml

@@ -43,8 +43,8 @@
             <version>2.1.0</version>
         </dependency>
         <dependency>
-            <groupId>com.bsoft</groupId>
-            <artifactId>bsoft-common</artifactId>
+            <groupId>com.hs</groupId>
+            <artifactId>hs-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
@@ -96,8 +96,8 @@
             <version>0.0.1-RELEASE</version>
         </dependency>
         <dependency>
-            <groupId>com.bsoft</groupId>
-            <artifactId>bsoft-common</artifactId>
+            <groupId>com.hs</groupId>
+            <artifactId>hs-common</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
@@ -121,7 +121,7 @@
                 <version>1.3.3</version>
                 <configuration>
                     <!--配置文件的位置-->
-                    <configurationFile>../bsoft-api/src/test/resources/generatorConfig.xml</configurationFile>
+                    <configurationFile>../hs-api/src/test/resources/generatorConfig.xml</configurationFile>
                     <verbose>true</verbose>
                     <overwrite>true</overwrite>
                 </configuration>

hs-api/src/main/java/com/hs/api/HsApiApplication.java

@@ -9,7 +9,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @EnableAsync
 @SpringBootApplication
 @MapperScan("com.hs.api.mapper")
-@ComponentScan(basePackages = {"com.bsoft.common.config","com.hs.api"})
+@ComponentScan(basePackages = {"com.hs.common.config","com.hs.api"})
 public class HsApiApplication {
 
     public static void main(String[] args) {

hs-api/src/main/java/com/hs/api/common/aspect/TokenAspect.java

@@ -3,7 +3,7 @@ package com.hs.api.common.aspect;
 import com.hs.api.common.Constants;
 import com.hs.api.common.exceptions.InvalidTokenException;
 import com.hs.api.common.utils.TokenUtil;
-import com.bsoft.common.utils.StringUtil;
+import com.hs.common.utils.StringUtil;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;

hs-api/src/main/java/com/hs/api/common/resolvers/CurrentUserMethodArgumentResolver.java

@@ -4,7 +4,7 @@ import com.hs.api.common.Constants;
 import com.hs.api.common.annotations.CurrentUser;
 import com.hs.api.common.utils.TokenUtil;
 import com.hs.api.model.SysUser;
-import com.bsoft.common.utils.RedisUtil;
+import com.hs.common.utils.RedisUtil;
 import org.springframework.core.MethodParameter;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;

hs-api/src/main/java/com/hs/api/common/utils/TokenUtil.java

 package com.hs.api.common.utils;
 
 import com.hs.api.model.SysUser;
-import com.bsoft.common.utils.JWTUtil;
-import com.bsoft.common.utils.RedisUtil;
+import com.hs.common.utils.JWTUtil;
+import com.hs.common.utils.RedisUtil;
 
 public class TokenUtil {
     public final static long TOKEN_TIME_OUT = 2L * 60 * 60;

hs-api/src/main/java/com/hs/api/controller/LoginController.java

@@ -4,7 +4,7 @@ import com.hs.api.common.Result;
 import com.hs.api.model.reqmodel.CodeAndPwd;
 import com.hs.api.model.respmodel.LoginInfo;
 import com.hs.api.service.LoginService;
-import com.bsoft.common.utils.HttpUtil;
+import com.hs.common.utils.HttpUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

hs-api/src/main/java/com/hs/api/service/Impl/SerDiseaseDocServiceImpl.java

@@ -3,7 +3,7 @@ package com.hs.api.service.Impl;
 import com.hs.api.mapper.SerDiseaseDocRsMapper;
 import com.hs.api.model.SerDiseaseDocRs;
 import com.hs.api.service.SerDiseaseDocService;
-import com.bsoft.common.utils.StringUtil;
+import com.hs.common.utils.StringUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

hs-api/src/main/java/com/hs/api/service/Impl/SerDiseaseServiceImpl.java

@@ -9,7 +9,7 @@ import com.hs.api.model.SerDisease;
 import com.hs.api.model.SysRole;
 import com.hs.api.model.respmodel.DiseaseLevel;
 import com.hs.api.service.SerDiseaseService;
-import com.bsoft.common.utils.StringUtil;
+import com.hs.common.utils.StringUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

hs-api/src/test/resources/generatorConfig.xml

@@ -34,7 +34,7 @@
             <!-- 针对mysql数据库 获取字段注释 -->
             <!--            <property name="useInformationSchema" value="true"></property>-->
         </jdbcConnection>
-        <!--        <javaTypeResolver type="com.bsoft.generator.JavaTypeResolverImpl"/>-->
+        <!--        <javaTypeResolver type="JavaTypeResolverImpl"/>-->
         <!-- 生成实体类配置 -->
         <javaModelGenerator targetPackage="com.bsoft.api.model" targetProject="src/main/java"/>
         <!-- 生成映射文件配置 -->

bsoft-common/pom.xml → hs-common/pom.xml

@@ -3,8 +3,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.bsoft</groupId>
-    <artifactId>bsoft-common</artifactId>
+    <groupId>com.hs</groupId>
+    <artifactId>hs-common</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

bsoft-common/src/main/java/com/bsoft/common/base/BaseMapper.java → hs-common/src/main/java/com/hs/common/base/BaseMapper.java

-package com.bsoft.common.base;
+package com.hs.common.base;
 
 public interface BaseMapper {
 }

bsoft-common/src/main/java/com/bsoft/common/base/BaseResult.java → hs-common/src/main/java/com/hs/common/base/BaseResult.java

-package com.bsoft.common.base;
+package com.hs.common.base;
 
 /**
  * 统一返回结果类

bsoft-common/src/main/java/com/bsoft/common/base/BaseService.java → hs-common/src/main/java/com/hs/common/base/BaseService.java

-package com.bsoft.common.base;
+package com.hs.common.base;
 
 public interface BaseService<Record> {
 }

bsoft-common/src/main/java/com/bsoft/common/base/BaseServiceImpl.java → hs-common/src/main/java/com/hs/common/base/BaseServiceImpl.java

-package com.bsoft.common.base;
+package com.hs.common.base;
 
 public abstract class BaseServiceImpl<Record> implements BaseService<Record> {
     protected abstract BaseMapper getMapper();

bsoft-common/src/main/java/com/bsoft/common/base/BaseServiceMock.java → hs-common/src/main/java/com/hs/common/base/BaseServiceMock.java

-package com.bsoft.common.base;
+package com.hs.common.base;
 
 public class BaseServiceMock implements BaseService {
 }

bsoft-common/src/main/java/com/bsoft/common/config/redisconfig/RedisConfig.java → hs-common/src/main/java/com/hs/common/config/redisconfig/RedisConfig.java

-package com.bsoft.common.config.redisconfig;
+package com.hs.common.config.redisconfig;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.bsoft.common.utils.RedisUtil;
+import com.hs.common.utils.RedisUtil;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.context.annotation.Bean;

bsoft-common/src/main/java/com/bsoft/common/config/swaggerconfig/SwaggerConfig.java → hs-common/src/main/java/com/hs/common/config/swaggerconfig/SwaggerConfig.java

-package com.bsoft.common.config.swaggerconfig;
+package com.hs.common.config.swaggerconfig;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -19,7 +19,7 @@ public class SwaggerConfig {
     //是否开启swagger，正式环境一般是需要关闭的，可根据springboot的多环境配置进行设置
     @Value(value = "${swagger.enabled:false}")
     Boolean swaggerEnabled = true;
-@Value("${swagger.basePackage:com.bsoft.api.controller}")
+@Value("${swagger.basePackage:com.hs.api.controller}")
     String basePackage;
 
     @Bean

bsoft-common/src/main/java/com/bsoft/common/utils/AESUtil.java → hs-common/src/main/java/com/hs/common/utils/AESUtil.java

-package com.bsoft.common.utils;
+package com.hs.common.utils;
 
 import sun.misc.BASE64Decoder;
 import sun.misc.BASE64Encoder;

bsoft-common/src/main/java/com/bsoft/common/utils/DESUtil.java → hs-common/src/main/java/com/hs/common/utils/DESUtil.java

-package com.bsoft.common.utils;
+package com.hs.common.utils;
 
 import javax.crypto.*;
 import javax.crypto.spec.DESKeySpec;

bsoft-common/src/main/java/com/bsoft/common/utils/HttpUtil.java → hs-common/src/main/java/com/hs/common/utils/HttpUtil.java

-package com.bsoft.common.utils;
+package com.hs.common.utils;
 
 import javax.servlet.http.HttpServletRequest;
 

bsoft-common/src/main/java/com/bsoft/common/utils/JWTUtil.java → hs-common/src/main/java/com/hs/common/utils/JWTUtil.java

-package com.bsoft.common.utils;
+package com.hs.common.utils;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTVerifier;

bsoft-common/src/main/java/com/bsoft/common/utils/JdbcUtil.java → hs-common/src/main/java/com/hs/common/utils/JdbcUtil.java

-package com.bsoft.common.utils;
+package com.hs.common.utils;
 
 import java.sql.*;
 import java.util.List;

bsoft-common/src/main/java/com/bsoft/common/utils/MD5Util.java → hs-common/src/main/java/com/hs/common/utils/MD5Util.java

-package com.bsoft.common.utils;
+package com.hs.common.utils;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;

bsoft-common/src/main/java/com/bsoft/common/utils/RedisUtil.java → hs-common/src/main/java/com/hs/common/utils/RedisUtil.java

-package com.bsoft.common.utils;
+package com.hs.common.utils;
 
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.util.CollectionUtils;

bsoft-common/src/main/java/com/bsoft/common/utils/StringUtil.java → hs-common/src/main/java/com/hs/common/utils/StringUtil.java

-package com.bsoft.common.utils;
+package com.hs.common.utils;
 
 public class StringUtil {
     public static boolean isNullOrEmpty(String str) {

bsoft-plugins/pom.xml → hs-plugins/pom.xml

@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.bsoft</groupId>
+    <groupId>com.hs</groupId>
     <version>1.0</version>
-    <artifactId>bsoft-plugins</artifactId>
+    <artifactId>hs-plugins</artifactId>
 
     <dependencies>
         <dependency>

bsoft-plugins/src/main/java/com/bsoft/generator/JavaTypeResolverImpl.java → hs-plugins/src/main/java/com/hs/generator/JavaTypeResolverImpl.java

-package com.bsoft.generator;
+package com.hs.generator;
 
 import org.mybatis.generator.api.dom.java.FullyQualifiedJavaType;
 import org.mybatis.generator.internal.types.JavaTypeResolverDefaultImpl;
@@ -6,7 +6,7 @@ import org.mybatis.generator.internal.types.JavaTypeResolverDefaultImpl;
 import java.sql.Types;
 
 public class JavaTypeResolverImpl extends JavaTypeResolverDefaultImpl {
-    public JavaTypeResolverImpl(){
+    public JavaTypeResolverImpl() {
         super();
         this.typeMap.put(Types.OTHER, new JdbcTypeInformation("VARCHAR", //$NON-NLS-1$
                 new FullyQualifiedJavaType(String.class.getName())));