From 26901efa2e14e3f0a6068edcee7742afe4100374 Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Mon, 27 May 2024 15:30:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=BE=AE=E6=9C=8D=E5=8A=A1=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E9=87=8D=E5=91=BD=E5=90=8D):=20=E8=B0=83=E6=95=B4Wiki?= =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、GroupId调整为com.microservices 2、启动类命名开头调整为Microservices*Application 3、日志输出目录调整为logs/microservices-* 4、应用名称调整为microservices-* --- .../microservices-modules-wiki/pom.xml | 18 +++++----- .../wiki/MicroservicesWikiApiApplication.java | 23 +++++++++++++ .../wiki/config/ExceptionInterceptor.java | 10 +++--- .../wiki/config/MyBatisPlusConfig.java | 6 ++-- .../wiki/contoller/sys/UserController.java | 6 ++-- .../wiki/contoller/wiki/WikiController.java | 28 +++++++-------- .../contoller/wiki/WikiExportController.java | 10 +++--- .../wiki/domain/members/Members.java | 2 +- .../wiki/domain/projects/Projects.java | 2 +- .../wiki/domain/sys/Token.java | 2 +- .../wiki/domain/sys/User.java | 2 +- .../wiki/domain/sys/UserExtension.java | 2 +- .../wiki/domain/sys/UserVo.java | 2 +- .../domain/team_projects/TeamProjects.java | 2 +- .../wiki/domain/wiki/Wiki.java | 2 +- .../wiki/domain/wiki/WikiContentSimple.java | 2 +- .../wiki/domain/wiki/WikiPage.java | 2 +- .../wiki/domain/wiki/vo/AuthorMessage.java | 2 +- .../wiki/domain/wiki/vo/CommitMessage.java | 2 +- .../wiki/domain/wiki/vo/WikiAllVo.java | 2 +- .../wiki/domain/wiki/vo/WikiCloneLinkVo.java | 2 +- .../wiki/domain/wiki/vo/WikiContent.java | 2 +- .../wiki/domain/wiki/vo/WikiDeleteVo.java | 2 +- .../wiki/domain/wiki/vo/WikiPageVo.java | 2 +- .../wiki/domain/wiki/vo/WikiVo.java | 2 +- .../wiki/handler/MetaHandler.java | 2 +- .../wiki/mapper/members/MembersMapper.java | 4 +-- .../wiki/mapper/projects/ProjectsMapper.java | 4 +-- .../wiki/mapper/sys/TokenMapper.java | 4 +-- .../wiki/mapper/sys/UserExtensionMapper.java | 4 +-- .../wiki/mapper/sys/UserMapper.java | 4 +-- .../team_projects/TeamProjectsMapper.java | 4 +-- .../wiki/refactoring/constant/Constants.java | 2 +- .../wiki/refactoring/enums/ResponseEnum.java | 2 +- .../refactoring/exception/BusiException.java | 2 +- .../response/HttpClientResult.java | 2 +- .../wiki/refactoring/utils/BeanCopyUtils.java | 4 +-- .../wiki/refactoring/utils/CommonUtils.java | 2 +- .../wiki/refactoring/utils/ConvertBean.java | 2 +- .../wiki/refactoring/utils/CookieUtil.java | 2 +- .../wiki/refactoring/utils/DateUtils.java | 4 +-- .../wiki/refactoring/utils/FastJsonUtils.java | 2 +- .../wiki/refactoring/utils/FileUtils.java | 2 +- .../utils/GetIpByRequestUtils.java | 2 +- .../refactoring/utils/HttpClientUtils.java | 4 +-- .../wiki/refactoring/utils/IDUtils.java | 2 +- .../wiki/refactoring/utils/MarkdownUtil.java | 2 +- .../refactoring/utils/ValidatorUtils.java | 2 +- .../wiki/service/sys/TokenService.java | 4 +-- .../service/sys/UserExtentionService.java | 4 +-- .../wiki/service/sys/UserService.java | 6 ++-- .../service/sys/impl/TokenServiceImpl.java | 8 ++--- .../sys/impl/UserExtensionServiceImpl.java | 8 ++--- .../service/sys/impl/UserServiceImpl.java | 28 +++++++-------- .../wiki/service/wiki/WikiService.java | 34 +++++++++---------- .../com/ruoyi/wiki/WikiApiApplication.java | 23 ------------- .../src/main/resources/bootstrap-prod.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/logback.xml | 4 +-- .../mapper/members/MembersMapper.xml | 12 +++---- .../mapper/projects/ProjectsMapper.xml | 12 ++++--- .../main/resources/mapper/sys/TokenMapper.xml | 12 +++---- .../mapper/sys/UserExtensionMapper.xml | 16 ++++----- .../main/resources/mapper/sys/UserMapper.xml | 12 +++---- .../team_projects/TeamProjectsMapper.xml | 12 +++---- 65 files changed, 201 insertions(+), 199 deletions(-) create mode 100644 microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/MicroservicesWikiApiApplication.java rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/config/ExceptionInterceptor.java (91%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/config/MyBatisPlusConfig.java (91%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/contoller/sys/UserController.java (85%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/contoller/wiki/WikiController.java (91%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/contoller/wiki/WikiExportController.java (93%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/members/Members.java (97%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/projects/Projects.java (99%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/sys/Token.java (96%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/sys/User.java (99%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/sys/UserExtension.java (99%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/sys/UserVo.java (97%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/team_projects/TeamProjects.java (95%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/wiki/Wiki.java (87%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/wiki/WikiContentSimple.java (88%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/wiki/WikiPage.java (71%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/wiki/vo/AuthorMessage.java (77%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/wiki/vo/CommitMessage.java (75%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/wiki/vo/WikiAllVo.java (90%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/wiki/vo/WikiCloneLinkVo.java (70%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/wiki/vo/WikiContent.java (88%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/wiki/vo/WikiDeleteVo.java (83%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/wiki/vo/WikiPageVo.java (84%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/domain/wiki/vo/WikiVo.java (75%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/handler/MetaHandler.java (94%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/mapper/members/MembersMapper.java (81%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/mapper/projects/ProjectsMapper.java (78%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/mapper/sys/TokenMapper.java (79%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/mapper/sys/UserExtensionMapper.java (82%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/mapper/sys/UserMapper.java (79%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/mapper/team_projects/TeamProjectsMapper.java (79%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/refactoring/constant/Constants.java (95%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/refactoring/enums/ResponseEnum.java (90%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/refactoring/exception/BusiException.java (91%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/refactoring/response/HttpClientResult.java (94%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/refactoring/utils/BeanCopyUtils.java (79%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/refactoring/utils/CommonUtils.java (97%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/refactoring/utils/ConvertBean.java (97%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/refactoring/utils/CookieUtil.java (93%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/refactoring/utils/DateUtils.java (99%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/refactoring/utils/FastJsonUtils.java (97%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/refactoring/utils/FileUtils.java (99%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/refactoring/utils/GetIpByRequestUtils.java (96%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/refactoring/utils/HttpClientUtils.java (99%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/refactoring/utils/IDUtils.java (90%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/refactoring/utils/MarkdownUtil.java (93%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/refactoring/utils/ValidatorUtils.java (97%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/service/sys/TokenService.java (74%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/service/sys/UserExtentionService.java (65%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/service/sys/UserService.java (73%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/service/sys/impl/TokenServiceImpl.java (81%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/service/sys/impl/UserExtensionServiceImpl.java (70%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/service/sys/impl/UserServiceImpl.java (86%) rename microservices-modules/microservices-modules-wiki/src/main/java/com/{ruoyi => microservices}/wiki/service/wiki/WikiService.java (96%) delete mode 100644 microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/WikiApiApplication.java diff --git a/microservices-modules/microservices-modules-wiki/pom.xml b/microservices-modules/microservices-modules-wiki/pom.xml index 5c77cdc2b..b2ae51883 100644 --- a/microservices-modules/microservices-modules-wiki/pom.xml +++ b/microservices-modules/microservices-modules-wiki/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> microservices-modules - com.ruoyi + com.microservices 3.6.2 4.0.0 @@ -51,35 +51,35 @@ - com.ruoyi + com.microservices microservices-common-async - com.ruoyi + com.microservices microservices-common-datasource - com.ruoyi + com.microservices microservices-common-datascope - com.ruoyi + com.microservices microservices-common-log - com.ruoyi + com.microservices microservices-common-swagger - com.ruoyi + com.microservices microservices-common-security @@ -87,7 +87,7 @@ spring-security-core - com.ruoyi + com.microservices microservices-common-core @@ -128,7 +128,7 @@ 4.5.14 - com.ruoyi + com.microservices microservices-common-httpClient 3.6.2 compile diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/MicroservicesWikiApiApplication.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/MicroservicesWikiApiApplication.java new file mode 100644 index 000000000..289432b5f --- /dev/null +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/MicroservicesWikiApiApplication.java @@ -0,0 +1,23 @@ +package com.microservices.wiki; + +import com.microservices.common.security.annotation.EnableCustomConfig; +import com.microservices.common.security.annotation.EnableRyFeignClients; +import com.microservices.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableScheduling; + +@EnableScheduling +//@EnableDiscoveryClient +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableRyFeignClients +@SpringBootApplication +public class MicroservicesWikiApiApplication { + + public static void main(String[] args) { + SpringApplication.run(MicroservicesWikiApiApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ Wiki模块启动成功 ლ(´ڡ`ლ)ﾞ \n"); + } + +} diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/config/ExceptionInterceptor.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/config/ExceptionInterceptor.java similarity index 91% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/config/ExceptionInterceptor.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/config/ExceptionInterceptor.java index 132910e80..7e1744004 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/config/ExceptionInterceptor.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/config/ExceptionInterceptor.java @@ -1,12 +1,12 @@ -package com.ruoyi.wiki.config; +package com.microservices.wiki.config; import cn.hutool.core.exceptions.ValidateException; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.wiki.refactoring.enums.ResponseEnum; -import com.ruoyi.wiki.refactoring.exception.BusiException; -import com.ruoyi.wiki.refactoring.utils.ValidatorUtils; +import com.microservices.common.core.web.domain.AjaxResult; +import com.microservices.wiki.refactoring.enums.ResponseEnum; +import com.microservices.wiki.refactoring.exception.BusiException; +import com.microservices.wiki.refactoring.utils.ValidatorUtils; import javassist.NotFoundException; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/config/MyBatisPlusConfig.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/config/MyBatisPlusConfig.java similarity index 91% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/config/MyBatisPlusConfig.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/config/MyBatisPlusConfig.java index 36a2364fb..062278104 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/config/MyBatisPlusConfig.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/config/MyBatisPlusConfig.java @@ -1,10 +1,10 @@ -package com.ruoyi.wiki.config; +package com.microservices.wiki.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.ruoyi.wiki.handler.MetaHandler; +import com.microservices.wiki.handler.MetaHandler; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @EnableTransactionManagement @Configuration -@MapperScan("com.ruoyi.wiki.mapper") +@MapperScan("com.microservices.wiki.mapper") public class MyBatisPlusConfig { /** diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/contoller/sys/UserController.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/contoller/sys/UserController.java similarity index 85% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/contoller/sys/UserController.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/contoller/sys/UserController.java index 549946282..572d55eae 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/contoller/sys/UserController.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/contoller/sys/UserController.java @@ -1,8 +1,8 @@ -package com.ruoyi.wiki.contoller.sys; +package com.microservices.wiki.contoller.sys; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.wiki.service.sys.UserService; +import com.microservices.common.core.web.domain.AjaxResult; +import com.microservices.wiki.service.sys.UserService; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/contoller/wiki/WikiController.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/contoller/wiki/WikiController.java similarity index 91% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/contoller/wiki/WikiController.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/contoller/wiki/WikiController.java index 2f2562a2e..1e86ec4c4 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/contoller/wiki/WikiController.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/contoller/wiki/WikiController.java @@ -1,18 +1,18 @@ -package com.ruoyi.wiki.contoller.wiki; +package com.microservices.wiki.contoller.wiki; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.wiki.domain.sys.User; -import com.ruoyi.wiki.domain.wiki.Wiki; -import com.ruoyi.wiki.domain.wiki.vo.WikiAllVo; -import com.ruoyi.wiki.domain.wiki.vo.WikiContent; -import com.ruoyi.wiki.domain.wiki.vo.WikiDeleteVo; -import com.ruoyi.wiki.domain.wiki.vo.WikiPageVo; -import com.ruoyi.wiki.refactoring.response.HttpClientResult; -import com.ruoyi.wiki.refactoring.utils.BeanCopyUtils; -import com.ruoyi.wiki.refactoring.utils.FastJsonUtils; -import com.ruoyi.wiki.service.sys.UserService; -import com.ruoyi.wiki.service.wiki.WikiService; +import com.microservices.common.core.exception.ServiceException; +import com.microservices.common.core.web.domain.AjaxResult; +import com.microservices.wiki.domain.sys.User; +import com.microservices.wiki.domain.wiki.Wiki; +import com.microservices.wiki.domain.wiki.vo.WikiAllVo; +import com.microservices.wiki.domain.wiki.vo.WikiContent; +import com.microservices.wiki.domain.wiki.vo.WikiDeleteVo; +import com.microservices.wiki.domain.wiki.vo.WikiPageVo; +import com.microservices.wiki.refactoring.response.HttpClientResult; +import com.microservices.wiki.refactoring.utils.BeanCopyUtils; +import com.microservices.wiki.refactoring.utils.FastJsonUtils; +import com.microservices.wiki.service.sys.UserService; +import com.microservices.wiki.service.wiki.WikiService; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.apache.commons.lang3.StringUtils; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/contoller/wiki/WikiExportController.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/contoller/wiki/WikiExportController.java similarity index 93% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/contoller/wiki/WikiExportController.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/contoller/wiki/WikiExportController.java index 590c8e59b..bf93a2b1a 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/contoller/wiki/WikiExportController.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/contoller/wiki/WikiExportController.java @@ -1,10 +1,10 @@ -package com.ruoyi.wiki.contoller.wiki; +package com.microservices.wiki.contoller.wiki; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.wiki.refactoring.response.HttpClientResult; -import com.ruoyi.wiki.service.wiki.WikiService; +import com.microservices.common.core.exception.ServiceException; +import com.microservices.common.core.web.domain.AjaxResult; +import com.microservices.wiki.refactoring.response.HttpClientResult; +import com.microservices.wiki.service.wiki.WikiService; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.slf4j.Logger; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/members/Members.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/members/Members.java similarity index 97% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/members/Members.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/members/Members.java index 0f24990c6..bee918668 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/members/Members.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/members/Members.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.members; +package com.microservices.wiki.domain.members; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/projects/Projects.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/projects/Projects.java similarity index 99% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/projects/Projects.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/projects/Projects.java index 046df9457..f0b055047 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/projects/Projects.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/projects/Projects.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.projects; +package com.microservices.wiki.domain.projects; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/sys/Token.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/sys/Token.java similarity index 96% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/sys/Token.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/sys/Token.java index 8d9abe68b..d7dbf4a91 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/sys/Token.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/sys/Token.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.sys; +package com.microservices.wiki.domain.sys; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/sys/User.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/sys/User.java similarity index 99% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/sys/User.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/sys/User.java index a1103b2a6..efc79b6b2 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/sys/User.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/sys/User.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.sys; +package com.microservices.wiki.domain.sys; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/sys/UserExtension.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/sys/UserExtension.java similarity index 99% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/sys/UserExtension.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/sys/UserExtension.java index d1ed4d78a..79f3bb567 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/sys/UserExtension.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/sys/UserExtension.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.sys; +package com.microservices.wiki.domain.sys; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/sys/UserVo.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/sys/UserVo.java similarity index 97% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/sys/UserVo.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/sys/UserVo.java index eef317fbc..a1868c940 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/sys/UserVo.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/sys/UserVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.sys; +package com.microservices.wiki.domain.sys; public class UserVo { private String username; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/team_projects/TeamProjects.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/team_projects/TeamProjects.java similarity index 95% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/team_projects/TeamProjects.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/team_projects/TeamProjects.java index dc065820f..5568653e6 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/team_projects/TeamProjects.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/team_projects/TeamProjects.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.team_projects; +package com.microservices.wiki.domain.team_projects; import java.util.Date; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/Wiki.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/Wiki.java similarity index 87% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/Wiki.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/Wiki.java index 614f53c3b..db27c2d9a 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/Wiki.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/Wiki.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.wiki; +package com.microservices.wiki.domain.wiki; import lombok.Data; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/WikiContentSimple.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/WikiContentSimple.java similarity index 88% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/WikiContentSimple.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/WikiContentSimple.java index 4299dd0d8..5b076fa97 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/WikiContentSimple.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/WikiContentSimple.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.wiki; +package com.microservices.wiki.domain.wiki; import lombok.Data; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/WikiPage.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/WikiPage.java similarity index 71% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/WikiPage.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/WikiPage.java index 790e7cd43..f022f5713 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/WikiPage.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/WikiPage.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.wiki; +package com.microservices.wiki.domain.wiki; import lombok.Data; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/AuthorMessage.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/AuthorMessage.java similarity index 77% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/AuthorMessage.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/AuthorMessage.java index f8f7d8f32..8afa2c137 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/AuthorMessage.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/AuthorMessage.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.wiki.vo; +package com.microservices.wiki.domain.wiki.vo; import lombok.Data; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/CommitMessage.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/CommitMessage.java similarity index 75% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/CommitMessage.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/CommitMessage.java index e76d65f32..227cb49bc 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/CommitMessage.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/CommitMessage.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.wiki.vo; +package com.microservices.wiki.domain.wiki.vo; import lombok.Data; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiAllVo.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiAllVo.java similarity index 90% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiAllVo.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiAllVo.java index 3d552a84c..828da9c95 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiAllVo.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiAllVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.wiki.vo; +package com.microservices.wiki.domain.wiki.vo; import lombok.Data; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiCloneLinkVo.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiCloneLinkVo.java similarity index 70% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiCloneLinkVo.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiCloneLinkVo.java index 5e4cfeb92..ac1f9f0ea 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiCloneLinkVo.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiCloneLinkVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.wiki.vo; +package com.microservices.wiki.domain.wiki.vo; import lombok.Data; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiContent.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiContent.java similarity index 88% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiContent.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiContent.java index 55a9aa21b..6306404a9 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiContent.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiContent.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.wiki.vo; +package com.microservices.wiki.domain.wiki.vo; import lombok.Data; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiDeleteVo.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiDeleteVo.java similarity index 83% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiDeleteVo.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiDeleteVo.java index 051668ed4..ab225f478 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiDeleteVo.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiDeleteVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.wiki.vo; +package com.microservices.wiki.domain.wiki.vo; import lombok.Data; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiPageVo.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiPageVo.java similarity index 84% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiPageVo.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiPageVo.java index 7a3763657..5cf45061f 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiPageVo.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiPageVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.wiki.vo; +package com.microservices.wiki.domain.wiki.vo; import lombok.Data; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiVo.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiVo.java similarity index 75% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiVo.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiVo.java index 61d9039f3..819fef789 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/domain/wiki/vo/WikiVo.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/domain/wiki/vo/WikiVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.domain.wiki.vo; +package com.microservices.wiki.domain.wiki.vo; import lombok.Data; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/handler/MetaHandler.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/handler/MetaHandler.java similarity index 94% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/handler/MetaHandler.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/handler/MetaHandler.java index b90bd22f5..212db243f 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/handler/MetaHandler.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/handler/MetaHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.handler; +package com.microservices.wiki.handler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/members/MembersMapper.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/members/MembersMapper.java similarity index 81% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/members/MembersMapper.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/members/MembersMapper.java index 3af667418..5da0d31ba 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/members/MembersMapper.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/members/MembersMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.wiki.mapper.members; +package com.microservices.wiki.mapper.members; -import com.ruoyi.wiki.domain.members.Members; +import com.microservices.wiki.domain.members.Members; import org.apache.ibatis.annotations.Param; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/projects/ProjectsMapper.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/projects/ProjectsMapper.java similarity index 78% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/projects/ProjectsMapper.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/projects/ProjectsMapper.java index 55600f1fd..55047d430 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/projects/ProjectsMapper.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/projects/ProjectsMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.wiki.mapper.projects; +package com.microservices.wiki.mapper.projects; -import com.ruoyi.wiki.domain.projects.Projects; +import com.microservices.wiki.domain.projects.Projects; import org.apache.ibatis.annotations.Param; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/sys/TokenMapper.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/sys/TokenMapper.java similarity index 79% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/sys/TokenMapper.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/sys/TokenMapper.java index 415b4677b..18acdda68 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/sys/TokenMapper.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/sys/TokenMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.wiki.mapper.sys; +package com.microservices.wiki.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.wiki.domain.sys.Token; +import com.microservices.wiki.domain.sys.Token; public interface TokenMapper extends BaseMapper { diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/sys/UserExtensionMapper.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/sys/UserExtensionMapper.java similarity index 82% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/sys/UserExtensionMapper.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/sys/UserExtensionMapper.java index af49fba97..d465eabd4 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/sys/UserExtensionMapper.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/sys/UserExtensionMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.wiki.mapper.sys; +package com.microservices.wiki.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.wiki.domain.sys.UserExtension; +import com.microservices.wiki.domain.sys.UserExtension; public interface UserExtensionMapper extends BaseMapper { diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/sys/UserMapper.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/sys/UserMapper.java similarity index 79% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/sys/UserMapper.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/sys/UserMapper.java index 0dc7abe19..09ab2cec2 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/sys/UserMapper.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/sys/UserMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.wiki.mapper.sys; +package com.microservices.wiki.mapper.sys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.wiki.domain.sys.User; +import com.microservices.wiki.domain.sys.User; public interface UserMapper extends BaseMapper { diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/team_projects/TeamProjectsMapper.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/team_projects/TeamProjectsMapper.java similarity index 79% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/team_projects/TeamProjectsMapper.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/team_projects/TeamProjectsMapper.java index 78ab01161..8d6a0f850 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/mapper/team_projects/TeamProjectsMapper.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/mapper/team_projects/TeamProjectsMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.wiki.mapper.team_projects; +package com.microservices.wiki.mapper.team_projects; -import com.ruoyi.wiki.domain.team_projects.TeamProjects; +import com.microservices.wiki.domain.team_projects.TeamProjects; import org.apache.ibatis.annotations.Param; public interface TeamProjectsMapper { diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/constant/Constants.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/constant/Constants.java similarity index 95% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/constant/Constants.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/constant/Constants.java index a53c7586a..fc9934366 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/constant/Constants.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/constant/Constants.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.refactoring.constant; +package com.microservices.wiki.refactoring.constant; import java.util.HashMap; import java.util.Map; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/enums/ResponseEnum.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/enums/ResponseEnum.java similarity index 90% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/enums/ResponseEnum.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/enums/ResponseEnum.java index d018149fa..d4a491e4d 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/enums/ResponseEnum.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/enums/ResponseEnum.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.refactoring.enums; +package com.microservices.wiki.refactoring.enums; public enum ResponseEnum { NOT_FOUND("404", "资源不存在"), diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/exception/BusiException.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/exception/BusiException.java similarity index 91% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/exception/BusiException.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/exception/BusiException.java index 88d90b3d7..e4cc83276 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/exception/BusiException.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/exception/BusiException.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.refactoring.exception; +package com.microservices.wiki.refactoring.exception; public class BusiException extends RuntimeException { private String errorCode = "999"; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/response/HttpClientResult.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/response/HttpClientResult.java similarity index 94% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/response/HttpClientResult.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/response/HttpClientResult.java index 86746bd22..9b7e8d0e4 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/response/HttpClientResult.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/response/HttpClientResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.refactoring.response; +package com.microservices.wiki.refactoring.response; import java.io.Serializable; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/BeanCopyUtils.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/BeanCopyUtils.java similarity index 79% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/BeanCopyUtils.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/BeanCopyUtils.java index 00f4ff78d..c111af7fd 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/BeanCopyUtils.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/BeanCopyUtils.java @@ -1,7 +1,7 @@ -package com.ruoyi.wiki.refactoring.utils; +package com.microservices.wiki.refactoring.utils; -import com.ruoyi.wiki.refactoring.exception.BusiException; +import com.microservices.wiki.refactoring.exception.BusiException; import org.springframework.beans.BeanUtils; public class BeanCopyUtils { diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/CommonUtils.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/CommonUtils.java similarity index 97% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/CommonUtils.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/CommonUtils.java index ee510c926..c26ad8103 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/CommonUtils.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/CommonUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.refactoring.utils; +package com.microservices.wiki.refactoring.utils; import org.springframework.beans.BeanUtils; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/ConvertBean.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/ConvertBean.java similarity index 97% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/ConvertBean.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/ConvertBean.java index 40cb36c03..ea53dd5fc 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/ConvertBean.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/ConvertBean.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.refactoring.utils; +package com.microservices.wiki.refactoring.utils; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/CookieUtil.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/CookieUtil.java similarity index 93% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/CookieUtil.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/CookieUtil.java index 8120fc15c..f9aa60259 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/CookieUtil.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/CookieUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.refactoring.utils; +package com.microservices.wiki.refactoring.utils; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/DateUtils.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/DateUtils.java similarity index 99% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/DateUtils.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/DateUtils.java index eab68003f..d93aed2f2 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/DateUtils.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/DateUtils.java @@ -1,7 +1,7 @@ -package com.ruoyi.wiki.refactoring.utils; +package com.microservices.wiki.refactoring.utils; -import com.ruoyi.wiki.refactoring.exception.BusiException; +import com.microservices.wiki.refactoring.exception.BusiException; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/FastJsonUtils.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/FastJsonUtils.java similarity index 97% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/FastJsonUtils.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/FastJsonUtils.java index c2f920168..010014dee 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/FastJsonUtils.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/FastJsonUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.refactoring.utils; +package com.microservices.wiki.refactoring.utils; import com.alibaba.fastjson2.JSON; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/FileUtils.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/FileUtils.java similarity index 99% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/FileUtils.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/FileUtils.java index 2994fa494..9e0d75ed2 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/FileUtils.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/FileUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.refactoring.utils; +package com.microservices.wiki.refactoring.utils; import org.apache.poi.util.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/GetIpByRequestUtils.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/GetIpByRequestUtils.java similarity index 96% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/GetIpByRequestUtils.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/GetIpByRequestUtils.java index cfc1d67e3..d02e5ba93 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/GetIpByRequestUtils.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/GetIpByRequestUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.refactoring.utils; +package com.microservices.wiki.refactoring.utils; import javax.servlet.http.HttpServletRequest; import java.net.InetAddress; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/HttpClientUtils.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/HttpClientUtils.java similarity index 99% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/HttpClientUtils.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/HttpClientUtils.java index da3638d09..9e24010b3 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/HttpClientUtils.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/HttpClientUtils.java @@ -1,6 +1,6 @@ -package com.ruoyi.wiki.refactoring.utils; +package com.microservices.wiki.refactoring.utils; -import com.ruoyi.wiki.refactoring.response.HttpClientResult; +import com.microservices.wiki.refactoring.response.HttpClientResult; import org.apache.http.*; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.entity.UrlEncodedFormEntity; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/IDUtils.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/IDUtils.java similarity index 90% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/IDUtils.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/IDUtils.java index 9b541dcd0..7cfe3b95d 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/IDUtils.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/IDUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.refactoring.utils; +package com.microservices.wiki.refactoring.utils; import java.util.Random; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/MarkdownUtil.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/MarkdownUtil.java similarity index 93% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/MarkdownUtil.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/MarkdownUtil.java index 54b85b089..70d9b90cf 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/MarkdownUtil.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/MarkdownUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.refactoring.utils; +package com.microservices.wiki.refactoring.utils; import com.vladsch.flexmark.ast.Node; import com.vladsch.flexmark.ext.tables.TablesExtension; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/ValidatorUtils.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/ValidatorUtils.java similarity index 97% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/ValidatorUtils.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/ValidatorUtils.java index 02be42a69..5c96a2142 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/refactoring/utils/ValidatorUtils.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/refactoring/utils/ValidatorUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.wiki.refactoring.utils; +package com.microservices.wiki.refactoring.utils; import org.apache.commons.lang3.StringUtils; import org.springframework.validation.BindingResult; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/TokenService.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/TokenService.java similarity index 74% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/TokenService.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/TokenService.java index c30e2d87f..bad299e24 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/TokenService.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/TokenService.java @@ -1,7 +1,7 @@ -package com.ruoyi.wiki.service.sys; +package com.microservices.wiki.service.sys; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.wiki.domain.sys.Token; +import com.microservices.wiki.domain.sys.Token; public interface TokenService extends IService { diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/UserExtentionService.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/UserExtentionService.java similarity index 65% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/UserExtentionService.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/UserExtentionService.java index e7e6fcf6f..46e6028df 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/UserExtentionService.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/UserExtentionService.java @@ -1,7 +1,7 @@ -package com.ruoyi.wiki.service.sys; +package com.microservices.wiki.service.sys; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.wiki.domain.sys.UserExtension; +import com.microservices.wiki.domain.sys.UserExtension; public interface UserExtentionService extends IService { diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/UserService.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/UserService.java similarity index 73% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/UserService.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/UserService.java index b1dcf0fef..ec0f47f41 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/UserService.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/UserService.java @@ -1,8 +1,8 @@ -package com.ruoyi.wiki.service.sys; +package com.microservices.wiki.service.sys; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.wiki.domain.sys.User; -import com.ruoyi.wiki.domain.sys.UserVo; +import com.microservices.wiki.domain.sys.User; +import com.microservices.wiki.domain.sys.UserVo; import javax.servlet.http.HttpServletRequest; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/impl/TokenServiceImpl.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/impl/TokenServiceImpl.java similarity index 81% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/impl/TokenServiceImpl.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/impl/TokenServiceImpl.java index 9454ebcb8..568f3103b 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/impl/TokenServiceImpl.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/impl/TokenServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.wiki.service.sys.impl; +package com.microservices.wiki.service.sys.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.wiki.domain.sys.Token; -import com.ruoyi.wiki.mapper.sys.TokenMapper; -import com.ruoyi.wiki.service.sys.TokenService; +import com.microservices.wiki.domain.sys.Token; +import com.microservices.wiki.mapper.sys.TokenMapper; +import com.microservices.wiki.service.sys.TokenService; import org.springframework.stereotype.Service; @Service diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/impl/UserExtensionServiceImpl.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/impl/UserExtensionServiceImpl.java similarity index 70% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/impl/UserExtensionServiceImpl.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/impl/UserExtensionServiceImpl.java index 907a87a50..a82c540df 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/impl/UserExtensionServiceImpl.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/impl/UserExtensionServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.wiki.service.sys.impl; +package com.microservices.wiki.service.sys.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.wiki.domain.sys.UserExtension; -import com.ruoyi.wiki.mapper.sys.UserExtensionMapper; -import com.ruoyi.wiki.service.sys.UserExtentionService; +import com.microservices.wiki.domain.sys.UserExtension; +import com.microservices.wiki.mapper.sys.UserExtensionMapper; +import com.microservices.wiki.service.sys.UserExtentionService; import org.springframework.stereotype.Service; @Service diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/impl/UserServiceImpl.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/impl/UserServiceImpl.java similarity index 86% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/impl/UserServiceImpl.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/impl/UserServiceImpl.java index 91ee65364..1233a54dc 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/sys/impl/UserServiceImpl.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/sys/impl/UserServiceImpl.java @@ -1,20 +1,20 @@ -package com.ruoyi.wiki.service.sys.impl; +package com.microservices.wiki.service.sys.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.wiki.domain.sys.Token; -import com.ruoyi.wiki.domain.sys.User; -import com.ruoyi.wiki.domain.sys.UserExtension; -import com.ruoyi.wiki.domain.sys.UserVo; -import com.ruoyi.wiki.mapper.sys.UserMapper; -import com.ruoyi.wiki.refactoring.constant.Constants; -import com.ruoyi.wiki.refactoring.response.HttpClientResult; -import com.ruoyi.wiki.refactoring.utils.CookieUtil; -import com.ruoyi.wiki.refactoring.utils.FastJsonUtils; -import com.ruoyi.wiki.refactoring.utils.HttpClientUtils; -import com.ruoyi.wiki.service.sys.TokenService; -import com.ruoyi.wiki.service.sys.UserExtentionService; -import com.ruoyi.wiki.service.sys.UserService; +import com.microservices.wiki.domain.sys.Token; +import com.microservices.wiki.domain.sys.User; +import com.microservices.wiki.domain.sys.UserExtension; +import com.microservices.wiki.domain.sys.UserVo; +import com.microservices.wiki.mapper.sys.UserMapper; +import com.microservices.wiki.refactoring.constant.Constants; +import com.microservices.wiki.refactoring.response.HttpClientResult; +import com.microservices.wiki.refactoring.utils.CookieUtil; +import com.microservices.wiki.refactoring.utils.FastJsonUtils; +import com.microservices.wiki.refactoring.utils.HttpClientUtils; +import com.microservices.wiki.service.sys.TokenService; +import com.microservices.wiki.service.sys.UserExtentionService; +import com.microservices.wiki.service.sys.UserService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/wiki/WikiService.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/wiki/WikiService.java similarity index 96% rename from microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/wiki/WikiService.java rename to microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/wiki/WikiService.java index 8be5e42c6..ff0d1ae4f 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/service/wiki/WikiService.java +++ b/microservices-modules/microservices-modules-wiki/src/main/java/com/microservices/wiki/service/wiki/WikiService.java @@ -1,26 +1,26 @@ -package com.ruoyi.wiki.service.wiki; +package com.microservices.wiki.service.wiki; import cn.hutool.core.util.ZipUtil; import com.alibaba.fastjson2.JSONArray; import com.github.jhonnymertz.wkhtmltopdf.wrapper.Pdf; import com.github.jhonnymertz.wkhtmltopdf.wrapper.configurations.WrapperConfig; import com.github.jhonnymertz.wkhtmltopdf.wrapper.params.Param; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.wiki.domain.projects.Projects; -import com.ruoyi.wiki.domain.sys.User; -import com.ruoyi.wiki.domain.sys.UserVo; -import com.ruoyi.wiki.domain.wiki.Wiki; -import com.ruoyi.wiki.domain.wiki.WikiContentSimple; -import com.ruoyi.wiki.domain.wiki.WikiPage; -import com.ruoyi.wiki.domain.wiki.vo.WikiCloneLinkVo; -import com.ruoyi.wiki.domain.wiki.vo.WikiPageVo; -import com.ruoyi.wiki.domain.wiki.vo.WikiVo; -import com.ruoyi.wiki.mapper.members.MembersMapper; -import com.ruoyi.wiki.mapper.projects.ProjectsMapper; -import com.ruoyi.wiki.mapper.team_projects.TeamProjectsMapper; -import com.ruoyi.wiki.refactoring.response.HttpClientResult; -import com.ruoyi.wiki.refactoring.utils.*; -import com.ruoyi.wiki.service.sys.UserService; +import com.microservices.common.core.exception.ServiceException; +import com.microservices.wiki.domain.projects.Projects; +import com.microservices.wiki.domain.sys.User; +import com.microservices.wiki.domain.sys.UserVo; +import com.microservices.wiki.domain.wiki.Wiki; +import com.microservices.wiki.domain.wiki.WikiContentSimple; +import com.microservices.wiki.domain.wiki.WikiPage; +import com.microservices.wiki.domain.wiki.vo.WikiCloneLinkVo; +import com.microservices.wiki.domain.wiki.vo.WikiPageVo; +import com.microservices.wiki.domain.wiki.vo.WikiVo; +import com.microservices.wiki.mapper.members.MembersMapper; +import com.microservices.wiki.mapper.projects.ProjectsMapper; +import com.microservices.wiki.mapper.team_projects.TeamProjectsMapper; +import com.microservices.wiki.refactoring.response.HttpClientResult; +import com.microservices.wiki.refactoring.utils.*; +import com.microservices.wiki.service.sys.UserService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/WikiApiApplication.java b/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/WikiApiApplication.java deleted file mode 100644 index 07e24706a..000000000 --- a/microservices-modules/microservices-modules-wiki/src/main/java/com/ruoyi/wiki/WikiApiApplication.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.ruoyi.wiki; - -import com.ruoyi.common.security.annotation.EnableCustomConfig; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; -import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.scheduling.annotation.EnableScheduling; - -@EnableScheduling -//@EnableDiscoveryClient -@EnableCustomConfig -@EnableCustomSwagger2 -@EnableRyFeignClients -@SpringBootApplication -public class WikiApiApplication { - - public static void main(String[] args) { - SpringApplication.run(WikiApiApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 项目管理模块启动成功 ლ(´ڡ`ლ)ﾞ \n"); - } - -} diff --git a/microservices-modules/microservices-modules-wiki/src/main/resources/bootstrap-prod.yml b/microservices-modules/microservices-modules-wiki/src/main/resources/bootstrap-prod.yml index b4ef88ec0..2467aefa8 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/resources/bootstrap-prod.yml +++ b/microservices-modules/microservices-modules-wiki/src/main/resources/bootstrap-prod.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-wiki + name: microservices-wiki config: activate: # 环境配置 diff --git a/microservices-modules/microservices-modules-wiki/src/main/resources/bootstrap.yml b/microservices-modules/microservices-modules-wiki/src/main/resources/bootstrap.yml index 889e1b0a0..dfc31a11a 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/resources/bootstrap.yml +++ b/microservices-modules/microservices-modules-wiki/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-wiki + name: microservices-wiki profiles: # 环境配置 active: dev diff --git a/microservices-modules/microservices-modules-wiki/src/main/resources/logback.xml b/microservices-modules/microservices-modules-wiki/src/main/resources/logback.xml index c3f49df5f..5f557215b 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/resources/logback.xml +++ b/microservices-modules/microservices-modules-wiki/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/members/MembersMapper.xml b/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/members/MembersMapper.xml index 88dd881ed..cac0b70c4 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/members/MembersMapper.xml +++ b/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/members/MembersMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -27,7 +27,7 @@ delete from members where id = #{id,jdbcType=INTEGER} - + insert into members (id, user_id, project_id, created_on, mail_notification, course_id, course_group_id, is_collect, graduation_group_id, @@ -37,7 +37,7 @@ #{courseGroupId,jdbcType=INTEGER}, #{isCollect,jdbcType=INTEGER}, #{graduationGroupId,jdbcType=INTEGER}, #{isApplySignature,jdbcType=BIT}) - + insert into members @@ -104,7 +104,7 @@ - + update members @@ -137,7 +137,7 @@ where id = #{id,jdbcType=INTEGER} - + update members set user_id = #{userId,jdbcType=INTEGER}, project_id = #{projectId,jdbcType=INTEGER}, diff --git a/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/projects/ProjectsMapper.xml b/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/projects/ProjectsMapper.xml index 3a8b42451..8553ce4b0 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/projects/ProjectsMapper.xml +++ b/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/projects/ProjectsMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -69,7 +69,7 @@ delete from projects where id = #{id,jdbcType=INTEGER} - + update projects set name = #{name,jdbcType=VARCHAR}, homepage = #{homepage,jdbcType=VARCHAR}, @@ -121,13 +121,15 @@ order_index = #{orderIndex,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER} - select id, is_public from projects where identifier = #{identifier} or identifier = #{identifier1} - select is_public from projects diff --git a/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/sys/TokenMapper.xml b/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/sys/TokenMapper.xml index 8069db8e8..d158a44d1 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/sys/TokenMapper.xml +++ b/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/sys/TokenMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -50,13 +50,13 @@ delete from tokens where id = #{id,jdbcType=INTEGER} - + insert into tokens (id, user_id, action, value, created_on) values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{action,jdbcType=VARCHAR}, #{value,jdbcType=VARCHAR}, #{createdOn,jdbcType=TIMESTAMP}) - + insert into tokens @@ -93,7 +93,7 @@ - + update tokens @@ -111,7 +111,7 @@ where id = #{id,jdbcType=INTEGER} - + update tokens set user_id = #{userId,jdbcType=INTEGER}, action = #{action,jdbcType=VARCHAR}, diff --git a/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/sys/UserExtensionMapper.xml b/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/sys/UserExtensionMapper.xml index e601cd220..de3c1d74a 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/sys/UserExtensionMapper.xml +++ b/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/sys/UserExtensionMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -23,7 +23,7 @@ - + @@ -46,7 +46,7 @@ delete from user_extensions where id = #{id,jdbcType=INTEGER} - + insert into user_extensions (id, user_id, birthday, brief_introduction, gender, location, occupation, work_experience, zip_code, @@ -64,7 +64,7 @@ #{description,jdbcType=VARCHAR}, #{departmentId,jdbcType=INTEGER}, #{province,jdbcType=LONGVARCHAR} ) - + insert into user_extensions @@ -197,7 +197,7 @@ - + update user_extensions @@ -263,7 +263,7 @@ where id = #{id,jdbcType=INTEGER} - + update user_extensions set user_id = #{userId,jdbcType=INTEGER}, birthday = #{birthday,jdbcType=DATE}, @@ -287,7 +287,7 @@ province = #{province,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=INTEGER} - + update user_extensions set user_id = #{userId,jdbcType=INTEGER}, birthday = #{birthday,jdbcType=DATE}, diff --git a/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/sys/UserMapper.xml b/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/sys/UserMapper.xml index 8858626bd..94ff9453c 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/sys/UserMapper.xml +++ b/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/sys/UserMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -91,7 +91,7 @@ delete from users where id = #{id,jdbcType=INTEGER} - + insert into users (id, login, hashed_password, firstname, lastname, mail, admin, status, last_login_on, @@ -125,7 +125,7 @@ #{watchersCount,jdbcType=INTEGER}, #{enterpriseCertification,jdbcType=BIT}, #{adminRole,jdbcType=TINYINT}, #{devopsStep,jdbcType=INTEGER}) - + insert into users @@ -402,7 +402,7 @@ - + update users @@ -537,7 +537,7 @@ where id = #{id,jdbcType=INTEGER} - + update users set login = #{login,jdbcType=VARCHAR}, hashed_password = #{hashedPassword,jdbcType=VARCHAR}, diff --git a/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/team_projects/TeamProjectsMapper.xml b/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/team_projects/TeamProjectsMapper.xml index 1e8fd77d1..38100c7c4 100644 --- a/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/team_projects/TeamProjectsMapper.xml +++ b/microservices-modules/microservices-modules-wiki/src/main/resources/mapper/team_projects/TeamProjectsMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -22,7 +22,7 @@ delete from team_projects where id = #{id,jdbcType=BIGINT} - + insert into team_projects (id, organization_id, project_id, team_id, created_at, updated_at ) @@ -30,7 +30,7 @@ #{teamId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP} ) - + insert into team_projects @@ -73,7 +73,7 @@ - + update team_projects @@ -94,7 +94,7 @@ where id = #{id,jdbcType=BIGINT} - + update team_projects set organization_id = #{organizationId,jdbcType=BIGINT}, project_id = #{projectId,jdbcType=BIGINT},