Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/dev_czh' into dev_czh

# Conflicts:
#	pom.xml
#	sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/constant/Global.java
#	sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/constant/HttpStatus.java
#	sckw-common/sckw-common-redis/src/main/java/com/sckw/redis/configure/RedissonConfiguration.java
#	sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml
PC 2 anni fa
parent
commit
21dd617ca1

+ 2 - 0
sckw-auth/src/main/java/com/sckw/auth/controller/IndexController.java

@@ -6,6 +6,8 @@ import com.sckw.auth.service.IIndexService;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.system.api.RemoteUserService;
 import com.sckw.system.api.RemoteUserService;
 import com.sckw.system.api.feign.RemoteUserFService;
 import com.sckw.system.api.feign.RemoteUserFService;
+import com.sckw.system.api.model.dto.req.RegisterReqDto;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

+ 0 - 1
sckw-modules-api/sckw-system-api/pom.xml

@@ -26,7 +26,6 @@
             <groupId>org.springframework.cloud</groupId>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-openfeign-core</artifactId>
             <artifactId>spring-cloud-openfeign-core</artifactId>
         </dependency>
         </dependency>
-
     </dependencies>
     </dependencies>
 
 
 </project>
 </project>