by su 3 rokov pred
rodič
commit
072f9a3d26

+ 1 - 1
4dkankan-center-modeling/pom.xml

@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>com.fdkankan</groupId>
 			<artifactId>4dkankan-common-utils</artifactId>
-			<version>2.0.3</version>
+			<version>2.0.0</version>
 		</dependency>
 
 		<dependency>

+ 1 - 1
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/constants/SysConstants.java

@@ -1,6 +1,6 @@
 package com.fdkankan.modeling.constants;
 
-import com.fdkankan.common.utils.FileUtils;
+import com.fdkankan.common.util.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;

+ 3 - 3
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneMQListener.java

@@ -18,9 +18,9 @@ import com.fdkankan.mq.util.RocketMQProducer;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ConstantUrl;
-import com.fdkankan.common.utils.CreateObjUtil;
-import com.fdkankan.common.utils.FileUtil;
-import com.fdkankan.common.utils.FileUtils;
+import com.fdkankan.common.util.CreateObjUtil;
+import com.fdkankan.common.util.FileUtil;
+import com.fdkankan.common.util.FileUtils;
 import com.taobao.api.ApiException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

+ 1 - 0
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneProServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.RecStatus;
 import com.fdkankan.common.constant.TbStatus;
+import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.modeling.entity.ScenePro;
 import com.fdkankan.modeling.entity.SceneProExt;
 import com.fdkankan.modeling.mapper.ISceneProMapper;

+ 1 - 1
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/utils/DingDingUtils.java

@@ -4,7 +4,7 @@ import com.dingtalk.api.DefaultDingTalkClient;
 import com.dingtalk.api.DingTalkClient;
 import com.dingtalk.api.request.OapiRobotSendRequest;
 import com.dingtalk.api.response.OapiRobotSendResponse;
-import com.fdkankan.common.utils.Base64Converter;
+import com.fdkankan.common.util.Base64Converter;
 import com.fdkankan.modeling.constants.SysConstants;
 import com.taobao.api.ApiException;
 import org.slf4j.Logger;

+ 1 - 1
4dkankan-center-platform/pom.xml

@@ -30,7 +30,7 @@
       <dependency>
           <groupId>com.fdkankan</groupId>
           <artifactId>4dkankan-common-utils</artifactId>
-          <version>2.0.3</version>
+          <version>2.0.0</version>
       </dependency>
 
       <dependency>

+ 2 - 0
4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/service/impl/UserServiceImpl.java

@@ -7,6 +7,8 @@ import com.fdkankan.common.constant.*;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.user.SSOLoginHelper;
 import com.fdkankan.common.user.SSOUser;
+import com.fdkankan.common.util.Base64Converter;
+import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.validation.Variable;
 import com.fdkankan.platform.goods.entity.CameraDetail;
 import com.fdkankan.platform.goods.entity.CameraDetailNumEntity;

+ 1 - 0
4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/service/sso/RegisterService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ConstantRegex;
 import com.fdkankan.common.constant.ConstantUrl;
+import com.fdkankan.common.util.Base64Converter;
 import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.common.util.SsoUtil;
 import com.fdkankan.common.validation.Variable;

+ 1 - 0
4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/service/sso/SsoManagerService.java

@@ -6,6 +6,7 @@ import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.LoginType;
 import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.util.Base64Converter;
 import com.fdkankan.common.util.PasswordUtils;
 import com.fdkankan.common.util.SsoUtil;
 import com.fdkankan.common.util.JwtUtil;

+ 1 - 1
4dkankan-common/pom.xml

@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-utils</artifactId>
-            <version>2.0.3</version>
+            <version>2.0.0</version>
         </dependency>
 
         <dependency>

+ 0 - 1
pom.xml

@@ -5,7 +5,6 @@
     <modelVersion>4.0.0</modelVersion>
     <modules>
         <module>4dkankan-common</module>
-        <module>4dkankan-gateway</module>
         <module>4dkankan-center-scene</module>
         <module>4dkankan-center-platform</module>
         <module>4dkankan-pom</module>