forked from Gitlink/microservices
feat(微服务平台重命名): 调整Wiki微服务
1、GroupId调整为com.microservices 2、启动类命名开头调整为Microservices*Application 3、日志输出目录调整为logs/microservices-* 4、应用名称调整为microservices-*
This commit is contained in:
parent
332cc32fd6
commit
26901efa2e
|
|
@ -4,7 +4,7 @@
|
|||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>microservices-modules</artifactId>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<groupId>com.microservices</groupId>
|
||||
<version>3.6.2</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
|
@ -51,35 +51,35 @@
|
|||
|
||||
<!-- RuoYi Common Async -->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<groupId>com.microservices</groupId>
|
||||
<artifactId>microservices-common-async</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- RuoYi Common DataSource -->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<groupId>com.microservices</groupId>
|
||||
<artifactId>microservices-common-datasource</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- RuoYi Common DataScope -->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<groupId>com.microservices</groupId>
|
||||
<artifactId>microservices-common-datascope</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- RuoYi Common Log -->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<groupId>com.microservices</groupId>
|
||||
<artifactId>microservices-common-log</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- RuoYi Common Swagger -->
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<groupId>com.microservices</groupId>
|
||||
<artifactId>microservices-common-swagger</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<groupId>com.microservices</groupId>
|
||||
<artifactId>microservices-common-security</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
<artifactId>spring-security-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<groupId>com.microservices</groupId>
|
||||
<artifactId>microservices-common-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
@ -128,7 +128,7 @@
|
|||
<version>4.5.14</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.ruoyi</groupId>
|
||||
<groupId>com.microservices</groupId>
|
||||
<artifactId>microservices-common-httpClient</artifactId>
|
||||
<version>3.6.2</version>
|
||||
<scope>compile</scope>
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
|
@ -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 {
|
||||
|
||||
/**
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.members;
|
||||
package com.microservices.wiki.domain.members;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.projects;
|
||||
package com.microservices.wiki.domain.projects;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.sys;
|
||||
package com.microservices.wiki.domain.sys;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
|
|
@ -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;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.sys;
|
||||
package com.microservices.wiki.domain.sys;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.sys;
|
||||
package com.microservices.wiki.domain.sys;
|
||||
|
||||
public class UserVo {
|
||||
private String username;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.team_projects;
|
||||
package com.microservices.wiki.domain.team_projects;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.wiki;
|
||||
package com.microservices.wiki.domain.wiki;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.wiki;
|
||||
package com.microservices.wiki.domain.wiki;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.wiki;
|
||||
package com.microservices.wiki.domain.wiki;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.wiki.vo;
|
||||
package com.microservices.wiki.domain.wiki.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.wiki.vo;
|
||||
package com.microservices.wiki.domain.wiki.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.wiki.vo;
|
||||
package com.microservices.wiki.domain.wiki.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.wiki.vo;
|
||||
package com.microservices.wiki.domain.wiki.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.wiki.vo;
|
||||
package com.microservices.wiki.domain.wiki.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.wiki.vo;
|
||||
package com.microservices.wiki.domain.wiki.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.wiki.vo;
|
||||
package com.microservices.wiki.domain.wiki.vo;
|
||||
|
||||
|
||||
import lombok.Data;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.domain.wiki.vo;
|
||||
package com.microservices.wiki.domain.wiki.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
||||
|
||||
|
|
@ -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;
|
||||
|
||||
|
||||
|
|
@ -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<Token> {
|
||||
|
||||
|
|
@ -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<UserExtension> {
|
||||
|
||||
|
|
@ -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<User> {
|
||||
|
||||
|
|
@ -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 {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.refactoring.constant;
|
||||
package com.microservices.wiki.refactoring.constant;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.refactoring.enums;
|
||||
package com.microservices.wiki.refactoring.enums;
|
||||
|
||||
public enum ResponseEnum {
|
||||
NOT_FOUND("404", "资源不存在"),
|
||||
|
|
@ -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";
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.refactoring.response;
|
||||
package com.microservices.wiki.refactoring.response;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
|
@ -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 {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.refactoring.utils;
|
||||
package com.microservices.wiki.refactoring.utils;
|
||||
|
||||
import org.springframework.beans.BeanUtils;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.refactoring.utils;
|
||||
package com.microservices.wiki.refactoring.utils;
|
||||
|
||||
|
||||
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.refactoring.utils;
|
||||
package com.microservices.wiki.refactoring.utils;
|
||||
|
||||
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.ruoyi.wiki.refactoring.utils;
|
||||
package com.microservices.wiki.refactoring.utils;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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<Token> {
|
||||
|
|
@ -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<UserExtension> {
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@ server:
|
|||
spring:
|
||||
application:
|
||||
# 应用名称
|
||||
name: ruoyi-wiki
|
||||
name: microservices-wiki
|
||||
config:
|
||||
activate:
|
||||
# 环境配置
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ server:
|
|||
spring:
|
||||
application:
|
||||
# 应用名称
|
||||
name: ruoyi-wiki
|
||||
name: microservices-wiki
|
||||
profiles:
|
||||
# 环境配置
|
||||
active: dev
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration scan="true" scanPeriod="60 seconds" debug="false">
|
||||
<!-- 日志存放路径 -->
|
||||
<property name="log.path" value="logs/ruoyi-wiki"/>
|
||||
<property name="log.path" value="logs/microservices-wiki"/>
|
||||
<!-- 日志输出格式 -->
|
||||
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
|
||||
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
</appender>
|
||||
|
||||
<!-- 系统模块日志级别控制 -->
|
||||
<logger name="com.ruoyi" level="info"/>
|
||||
<logger name="com.microservices" level="info"/>
|
||||
<!-- Spring日志级别控制 -->
|
||||
<logger name="org.springframework" level="warn"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="com.ruoyi.wiki.mapper.members.MembersMapper" >
|
||||
<resultMap id="BaseResultMap" type="com.ruoyi.wiki.domain.members.Members" >
|
||||
<mapper namespace="com.microservices.wiki.mapper.members.MembersMapper">
|
||||
<resultMap id="BaseResultMap" type="com.microservices.wiki.domain.members.Members">
|
||||
<id column="id" property="id" jdbcType="INTEGER" />
|
||||
<result column="user_id" property="userId" jdbcType="INTEGER" />
|
||||
<result column="project_id" property="projectId" jdbcType="INTEGER" />
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
delete from members
|
||||
where id = #{id,jdbcType=INTEGER}
|
||||
</delete>
|
||||
<insert id="insert" parameterType="com.ruoyi.wiki.domain.members.Members" >
|
||||
<insert id="insert" parameterType="com.microservices.wiki.domain.members.Members">
|
||||
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>
|
||||
<insert id="insertSelective" parameterType="com.ruoyi.wiki.domain.members.Members" >
|
||||
<insert id="insertSelective" parameterType="com.microservices.wiki.domain.members.Members">
|
||||
insert into members
|
||||
<trim prefix="(" suffix=")" suffixOverrides="," >
|
||||
<if test="id != null" >
|
||||
|
|
@ -104,7 +104,7 @@
|
|||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.wiki.domain.members.Members" >
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.microservices.wiki.domain.members.Members">
|
||||
update members
|
||||
<set >
|
||||
<if test="userId != null" >
|
||||
|
|
@ -137,7 +137,7 @@
|
|||
</set>
|
||||
where id = #{id,jdbcType=INTEGER}
|
||||
</update>
|
||||
<update id="updateByPrimaryKey" parameterType="com.ruoyi.wiki.domain.members.Members" >
|
||||
<update id="updateByPrimaryKey" parameterType="com.microservices.wiki.domain.members.Members">
|
||||
update members
|
||||
set user_id = #{userId,jdbcType=INTEGER},
|
||||
project_id = #{projectId,jdbcType=INTEGER},
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="com.ruoyi.wiki.mapper.projects.ProjectsMapper" >
|
||||
<resultMap id="BaseResultMap" type="com.ruoyi.wiki.domain.projects.Projects" >
|
||||
<mapper namespace="com.microservices.wiki.mapper.projects.ProjectsMapper">
|
||||
<resultMap id="BaseResultMap" type="com.microservices.wiki.domain.projects.Projects">
|
||||
<id column="id" property="id" jdbcType="INTEGER" />
|
||||
<result column="name" property="name" jdbcType="VARCHAR" />
|
||||
<result column="description" property="description" jdbcType="LONGVARCHAR" />
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
delete from projects
|
||||
where id = #{id,jdbcType=INTEGER}
|
||||
</delete>
|
||||
<update id="updateByPrimaryKey" parameterType="com.ruoyi.wiki.domain.projects.Projects" >
|
||||
<update id="updateByPrimaryKey" parameterType="com.microservices.wiki.domain.projects.Projects">
|
||||
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}
|
||||
</update>
|
||||
<select id="getProjectByLoginAndIdentifier" resultMap="BaseResultMap" parameterType="com.ruoyi.wiki.domain.projects.Projects" >
|
||||
<select id="getProjectByLoginAndIdentifier" resultMap="BaseResultMap"
|
||||
parameterType="com.microservices.wiki.domain.projects.Projects">
|
||||
select
|
||||
id, is_public
|
||||
from projects
|
||||
where identifier = #{identifier} or identifier = #{identifier1}
|
||||
</select>
|
||||
<select id="getProjectById" resultMap="BaseResultMap" parameterType="com.ruoyi.wiki.domain.projects.Projects" >
|
||||
<select id="getProjectById" resultMap="BaseResultMap"
|
||||
parameterType="com.microservices.wiki.domain.projects.Projects">
|
||||
select
|
||||
is_public
|
||||
from projects
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="com.ruoyi.wiki.mapper.sys.TokenMapper" >
|
||||
<resultMap id="BaseResultMap" type="com.ruoyi.wiki.domain.sys.Token" >
|
||||
<mapper namespace="com.microservices.wiki.mapper.sys.TokenMapper">
|
||||
<resultMap id="BaseResultMap" type="com.microservices.wiki.domain.sys.Token">
|
||||
<id column="id" property="id" jdbcType="INTEGER" />
|
||||
<result column="user_id" property="userId" jdbcType="INTEGER" />
|
||||
<result column="action" property="action" jdbcType="VARCHAR" />
|
||||
|
|
@ -50,13 +50,13 @@
|
|||
delete from tokens
|
||||
where id = #{id,jdbcType=INTEGER}
|
||||
</delete>
|
||||
<insert id="insert" parameterType="com.ruoyi.wiki.domain.sys.Token" >
|
||||
<insert id="insert" parameterType="com.microservices.wiki.domain.sys.Token">
|
||||
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>
|
||||
<insert id="insertSelective" parameterType="com.ruoyi.wiki.domain.sys.Token" >
|
||||
<insert id="insertSelective" parameterType="com.microservices.wiki.domain.sys.Token">
|
||||
insert into tokens
|
||||
<trim prefix="(" suffix=")" suffixOverrides="," >
|
||||
<if test="id != null" >
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.wiki.domain.sys.Token" >
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.microservices.wiki.domain.sys.Token">
|
||||
update tokens
|
||||
<set >
|
||||
<if test="userId != null" >
|
||||
|
|
@ -111,7 +111,7 @@
|
|||
</set>
|
||||
where id = #{id,jdbcType=INTEGER}
|
||||
</update>
|
||||
<update id="updateByPrimaryKey" parameterType="com.ruoyi.wiki.domain.sys.Token" >
|
||||
<update id="updateByPrimaryKey" parameterType="com.microservices.wiki.domain.sys.Token">
|
||||
update tokens
|
||||
set user_id = #{userId,jdbcType=INTEGER},
|
||||
action = #{action,jdbcType=VARCHAR},
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="com.ruoyi.wiki.mapper.sys.UserExtensionMapper" >
|
||||
<resultMap id="BaseResultMap" type="com.ruoyi.wiki.domain.sys.UserExtension" >
|
||||
<mapper namespace="com.microservices.wiki.mapper.sys.UserExtensionMapper">
|
||||
<resultMap id="BaseResultMap" type="com.microservices.wiki.domain.sys.UserExtension">
|
||||
<id column="id" property="id" jdbcType="INTEGER" />
|
||||
<result column="user_id" property="userId" jdbcType="INTEGER" />
|
||||
<result column="birthday" property="birthday" jdbcType="DATE" />
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
<result column="description" property="description" jdbcType="VARCHAR" />
|
||||
<result column="department_id" property="departmentId" jdbcType="INTEGER" />
|
||||
</resultMap>
|
||||
<resultMap id="ResultMapWithBLOBs" type="com.ruoyi.wiki.domain.sys.UserExtension" extends="BaseResultMap" >
|
||||
<resultMap id="ResultMapWithBLOBs" type="com.microservices.wiki.domain.sys.UserExtension" extends="BaseResultMap">
|
||||
<result column="province" property="province" jdbcType="LONGVARCHAR" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List" >
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
delete from user_extensions
|
||||
where id = #{id,jdbcType=INTEGER}
|
||||
</delete>
|
||||
<insert id="insert" parameterType="com.ruoyi.wiki.domain.sys.UserExtension" >
|
||||
<insert id="insert" parameterType="com.microservices.wiki.domain.sys.UserExtension">
|
||||
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>
|
||||
<insert id="insertSelective" parameterType="com.ruoyi.wiki.domain.sys.UserExtension" >
|
||||
<insert id="insertSelective" parameterType="com.microservices.wiki.domain.sys.UserExtension">
|
||||
insert into user_extensions
|
||||
<trim prefix="(" suffix=")" suffixOverrides="," >
|
||||
<if test="id != null" >
|
||||
|
|
@ -197,7 +197,7 @@
|
|||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.wiki.domain.sys.UserExtension" >
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.microservices.wiki.domain.sys.UserExtension">
|
||||
update user_extensions
|
||||
<set >
|
||||
<if test="userId != null" >
|
||||
|
|
@ -263,7 +263,7 @@
|
|||
</set>
|
||||
where id = #{id,jdbcType=INTEGER}
|
||||
</update>
|
||||
<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.ruoyi.wiki.domain.sys.UserExtension" >
|
||||
<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.microservices.wiki.domain.sys.UserExtension">
|
||||
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>
|
||||
<update id="updateByPrimaryKey" parameterType="com.ruoyi.wiki.domain.sys.UserExtension" >
|
||||
<update id="updateByPrimaryKey" parameterType="com.microservices.wiki.domain.sys.UserExtension">
|
||||
update user_extensions
|
||||
set user_id = #{userId,jdbcType=INTEGER},
|
||||
birthday = #{birthday,jdbcType=DATE},
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="com.ruoyi.wiki.mapper.sys.UserMapper" >
|
||||
<resultMap id="BaseResultMap" type="com.ruoyi.wiki.domain.sys.User" >
|
||||
<mapper namespace="com.microservices.wiki.mapper.sys.UserMapper">
|
||||
<resultMap id="BaseResultMap" type="com.microservices.wiki.domain.sys.User">
|
||||
<id column="id" property="id" jdbcType="INTEGER" />
|
||||
<result column="login" property="login" jdbcType="VARCHAR" />
|
||||
<result column="hashed_password" property="hashedPassword" jdbcType="VARCHAR" />
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
delete from users
|
||||
where id = #{id,jdbcType=INTEGER}
|
||||
</delete>
|
||||
<insert id="insert" parameterType="com.ruoyi.wiki.domain.sys.User" >
|
||||
<insert id="insert" parameterType="com.microservices.wiki.domain.sys.User">
|
||||
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>
|
||||
<insert id="insertSelective" parameterType="com.ruoyi.wiki.domain.sys.User" >
|
||||
<insert id="insertSelective" parameterType="com.microservices.wiki.domain.sys.User">
|
||||
insert into users
|
||||
<trim prefix="(" suffix=")" suffixOverrides="," >
|
||||
<if test="id != null" >
|
||||
|
|
@ -402,7 +402,7 @@
|
|||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.wiki.domain.sys.User" >
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.microservices.wiki.domain.sys.User">
|
||||
update users
|
||||
<set >
|
||||
<if test="login != null" >
|
||||
|
|
@ -537,7 +537,7 @@
|
|||
</set>
|
||||
where id = #{id,jdbcType=INTEGER}
|
||||
</update>
|
||||
<update id="updateByPrimaryKey" parameterType="com.ruoyi.wiki.domain.sys.User" >
|
||||
<update id="updateByPrimaryKey" parameterType="com.microservices.wiki.domain.sys.User">
|
||||
update users
|
||||
set login = #{login,jdbcType=VARCHAR},
|
||||
hashed_password = #{hashedPassword,jdbcType=VARCHAR},
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="com.ruoyi.wiki.mapper.team_projects.TeamProjectsMapper" >
|
||||
<resultMap id="BaseResultMap" type="com.ruoyi.wiki.domain.team_projects.TeamProjects" >
|
||||
<mapper namespace="com.microservices.wiki.mapper.team_projects.TeamProjectsMapper">
|
||||
<resultMap id="BaseResultMap" type="com.microservices.wiki.domain.team_projects.TeamProjects">
|
||||
<id column="id" property="id" jdbcType="BIGINT" />
|
||||
<result column="organization_id" property="organizationId" jdbcType="BIGINT" />
|
||||
<result column="project_id" property="projectId" jdbcType="BIGINT" />
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
delete from team_projects
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
</delete>
|
||||
<insert id="insert" parameterType="com.ruoyi.wiki.domain.team_projects.TeamProjects" >
|
||||
<insert id="insert" parameterType="com.microservices.wiki.domain.team_projects.TeamProjects">
|
||||
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>
|
||||
<insert id="insertSelective" parameterType="com.ruoyi.wiki.domain.team_projects.TeamProjects" >
|
||||
<insert id="insertSelective" parameterType="com.microservices.wiki.domain.team_projects.TeamProjects">
|
||||
insert into team_projects
|
||||
<trim prefix="(" suffix=")" suffixOverrides="," >
|
||||
<if test="id != null" >
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.wiki.domain.team_projects.TeamProjects" >
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.microservices.wiki.domain.team_projects.TeamProjects">
|
||||
update team_projects
|
||||
<set >
|
||||
<if test="organizationId != null" >
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
</set>
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
</update>
|
||||
<update id="updateByPrimaryKey" parameterType="com.ruoyi.wiki.domain.team_projects.TeamProjects" >
|
||||
<update id="updateByPrimaryKey" parameterType="com.microservices.wiki.domain.team_projects.TeamProjects">
|
||||
update team_projects
|
||||
set organization_id = #{organizationId,jdbcType=BIGINT},
|
||||
project_id = #{projectId,jdbcType=BIGINT},
|
||||
|
|
|
|||
Loading…
Reference in New Issue