zxy 3 lat temu
rodzic
commit
26008b70f4
47 zmienionych plików z 98 dodań i 98 usunięć
  1. 2 2
      src/main/java/io/renren/ApiApplication.java
  2. 1 1
      src/main/java/io/renren/annotation/Login.java
  3. 1 1
      src/main/java/io/renren/annotation/LoginUser.java
  4. 2 2
      src/main/java/io/renren/config/FilterConfig.java
  5. 1 1
      src/main/java/io/renren/config/MybatisPlusConfig.java
  6. 3 3
      src/main/java/io/renren/config/SwaggerConfig.java
  7. 3 3
      src/main/java/io/renren/config/WebMvcConfig.java
  8. 6 6
      src/main/java/io/renren/controller/ApiLoginController.java
  9. 6 6
      src/main/java/io/renren/controller/ApiRegisterController.java
  10. 5 5
      src/main/java/io/renren/controller/ApiTestController.java
  11. 2 2
      src/main/java/io/renren/dao/TokenDao.java
  12. 2 2
      src/main/java/io/renren/dao/UserDao.java
  13. 1 1
      src/main/java/io/renren/entity/TokenEntity.java
  14. 1 1
      src/main/java/io/renren/entity/UserEntity.java
  15. 1 1
      src/main/java/io/renren/form/LoginForm.java
  16. 1 1
      src/main/java/io/renren/form/RegisterForm.java
  17. 5 5
      src/main/java/io/renren/interceptor/AuthorizationInterceptor.java
  18. 5 5
      src/main/java/io/renren/resolver/LoginUserHandlerMethodArgumentResolver.java
  19. 2 2
      src/main/java/io/renren/service/TokenService.java
  20. 3 3
      src/main/java/io/renren/service/UserService.java
  21. 4 4
      src/main/java/io/renren/service/impl/TokenServiceImpl.java
  22. 9 9
      src/main/java/io/renren/service/impl/UserServiceImpl.java
  23. 4 4
      src/main/java/io/common/aspect/RedisAspect.java
  24. 1 1
      src/main/java/io/common/config/RedisConfig.java
  25. 1 1
      src/main/java/io/common/exception/RRException.java
  26. 1 1
      src/main/java/io/common/utils/DateUtils.java
  27. 1 1
      src/main/java/io/common/utils/HttpContextUtils.java
  28. 1 1
      src/main/java/io/common/utils/IPUtils.java
  29. 1 1
      src/main/java/io/common/utils/PageUtils.java
  30. 1 1
      src/main/java/io/common/utils/R.java
  31. 1 1
      src/main/java/io/common/utils/RedisUtils.java
  32. 1 1
      src/main/java/io/common/utils/SpringContextUtils.java
  33. 2 2
      src/main/java/io/common/validator/Assert.java
  34. 2 2
      src/main/java/io/common/validator/ValidatorUtils.java
  35. 1 1
      src/main/java/io/common/validator/group/AddGroup.java
  36. 1 1
      src/main/java/io/common/validator/group/Group.java
  37. 1 1
      src/main/java/io/common/validator/group/UpdateGroup.java
  38. 1 1
      src/main/java/io/common/xss/HTMLFilter.java
  39. 2 2
      src/main/java/io/common/xss/SQLFilter.java
  40. 1 1
      src/main/java/io/common/xss/XssFilter.java
  41. 1 1
      src/main/java/io/common/xss/XssHttpServletRequestWrapper.java
  42. 1 1
      src/main/resources/application-dev.yml
  43. 1 1
      src/main/resources/application-prod.yml
  44. 1 1
      src/main/resources/application-test.yml
  45. 2 2
      src/main/resources/application.yml
  46. 1 1
      src/main/resources/mapper/TokenDao.xml
  47. 1 1
      src/main/resources/mapper/UserDao.xml

+ 2 - 2
src/main/java/io/renren/ApiApplication.java

@@ -6,14 +6,14 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren;
9
+package com.api;
10 10
 
11 11
 import org.springframework.boot.SpringApplication;
12 12
 import org.springframework.boot.autoconfigure.SpringBootApplication;
13 13
 import org.springframework.context.annotation.ComponentScan;
14 14
 
15 15
 @SpringBootApplication
16
-@ComponentScan({"io.common","io.renren"})
16
+@ComponentScan({"io.common","io.api"})
17 17
 public class ApiApplication {
18 18
 
19 19
 	public static void main(String[] args) {

+ 1 - 1
src/main/java/io/renren/annotation/Login.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.annotation;
9
+package com.api.annotation;
10 10
 
11 11
 import java.lang.annotation.*;
12 12
 

+ 1 - 1
src/main/java/io/renren/annotation/LoginUser.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.annotation;
9
+package com.api.annotation;
10 10
 
11 11
 import java.lang.annotation.ElementType;
12 12
 import java.lang.annotation.Retention;

+ 2 - 2
src/main/java/io/renren/config/FilterConfig.java

@@ -6,9 +6,9 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.config;
9
+package com.api.config;
10 10
 
11
-import io.common.xss.XssFilter;
11
+import com.common.xss.XssFilter;
12 12
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
13 13
 import org.springframework.context.annotation.Bean;
14 14
 import org.springframework.context.annotation.Configuration;

+ 1 - 1
src/main/java/io/renren/config/MybatisPlusConfig.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.config;
9
+package com.api.config;
10 10
 
11 11
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;
12 12
 import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;

+ 3 - 3
src/main/java/io/renren/config/SwaggerConfig.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.config;
9
+package com.api.config;
10 10
 
11 11
 
12 12
 import io.swagger.annotations.ApiOperation;
@@ -36,7 +36,7 @@ public class SwaggerConfig {
36 36
             //加了ApiOperation注解的类,才生成接口文档
37 37
             .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
38 38
             //包下的类,才生成接口文档
39
-            //.apis(RequestHandlerSelectors.basePackage("io.renren.controller"))
39
+            //.apis(RequestHandlerSelectors.basePackage("io.api.controller"))
40 40
             .paths(PathSelectors.any())
41 41
             .build()
42 42
             .securitySchemes(security());
@@ -45,7 +45,7 @@ public class SwaggerConfig {
45 45
     private ApiInfo apiInfo() {
46 46
         return new ApiInfoBuilder()
47 47
             .title("人人开源")
48
-            .description("renren-api文档")
48
+            .description("api-api文档")
49 49
             .termsOfServiceUrl("https://www.renren.io")
50 50
             .version("4.0.0")
51 51
             .build();

+ 3 - 3
src/main/java/io/renren/config/WebMvcConfig.java

@@ -6,10 +6,10 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.config;
9
+package com.api.config;
10 10
 
11
-import io.renren.interceptor.AuthorizationInterceptor;
12
-import io.renren.resolver.LoginUserHandlerMethodArgumentResolver;
11
+import com.api.interceptor.AuthorizationInterceptor;
12
+import com.api.resolver.LoginUserHandlerMethodArgumentResolver;
13 13
 import org.springframework.beans.factory.annotation.Autowired;
14 14
 import org.springframework.context.annotation.Configuration;
15 15
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;

+ 6 - 6
src/main/java/io/renren/controller/ApiLoginController.java

@@ -6,15 +6,15 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.controller;
9
+package com.api.controller;
10 10
 
11 11
 
12
-import io.common.utils.R;
13
-import io.renren.annotation.Login;
12
+import com.common.utils.R;
13
+import com.api.annotation.Login;
14 14
 
15
-import io.renren.form.LoginForm;
16
-import io.renren.service.TokenService;
17
-import io.renren.service.UserService;
15
+import com.api.form.LoginForm;
16
+import com.api.service.TokenService;
17
+import com.api.service.UserService;
18 18
 import io.swagger.annotations.Api;
19 19
 import io.swagger.annotations.ApiOperation;
20 20
 import org.springframework.beans.factory.annotation.Autowired;

+ 6 - 6
src/main/java/io/renren/controller/ApiRegisterController.java

@@ -6,13 +6,13 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.controller;
9
+package com.api.controller;
10 10
 
11
-import io.common.utils.R;
12
-import io.common.validator.ValidatorUtils;
13
-import io.renren.entity.UserEntity;
14
-import io.renren.form.RegisterForm;
15
-import io.renren.service.UserService;
11
+import com.common.utils.R;
12
+import com.common.validator.ValidatorUtils;
13
+import com.api.entity.UserEntity;
14
+import com.api.form.RegisterForm;
15
+import com.api.service.UserService;
16 16
 import io.swagger.annotations.Api;
17 17
 import io.swagger.annotations.ApiOperation;
18 18
 import org.apache.commons.codec.digest.DigestUtils;

+ 5 - 5
src/main/java/io/renren/controller/ApiTestController.java

@@ -6,12 +6,12 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.controller;
9
+package com.api.controller;
10 10
 
11
-import io.common.utils.R;
12
-import io.renren.annotation.Login;
13
-import io.renren.annotation.LoginUser;
14
-import io.renren.entity.UserEntity;
11
+import com.common.utils.R;
12
+import com.api.annotation.Login;
13
+import com.api.annotation.LoginUser;
14
+import com.api.entity.UserEntity;
15 15
 import io.swagger.annotations.Api;
16 16
 import io.swagger.annotations.ApiOperation;
17 17
 import org.springframework.web.bind.annotation.GetMapping;

+ 2 - 2
src/main/java/io/renren/dao/TokenDao.java

@@ -6,10 +6,10 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.dao;
9
+package com.api.dao;
10 10
 
11 11
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
12
-import io.renren.entity.TokenEntity;
12
+import com.api.entity.TokenEntity;
13 13
 import org.apache.ibatis.annotations.Mapper;
14 14
 
15 15
 /**

+ 2 - 2
src/main/java/io/renren/dao/UserDao.java

@@ -6,10 +6,10 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.dao;
9
+package com.api.dao;
10 10
 
11 11
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
12
-import io.renren.entity.UserEntity;
12
+import com.api.entity.UserEntity;
13 13
 import org.apache.ibatis.annotations.Mapper;
14 14
 
15 15
 /**

+ 1 - 1
src/main/java/io/renren/entity/TokenEntity.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.entity;
9
+package com.api.entity;
10 10
 
11 11
 import com.baomidou.mybatisplus.annotation.IdType;
12 12
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
src/main/java/io/renren/entity/UserEntity.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.entity;
9
+package com.api.entity;
10 10
 
11 11
 import com.baomidou.mybatisplus.annotation.TableId;
12 12
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
src/main/java/io/renren/form/LoginForm.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.form;
9
+package com.api.form;
10 10
 
11 11
 import io.swagger.annotations.ApiModel;
12 12
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
src/main/java/io/renren/form/RegisterForm.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.form;
9
+package com.api.form;
10 10
 
11 11
 import io.swagger.annotations.ApiModel;
12 12
 import io.swagger.annotations.ApiModelProperty;

+ 5 - 5
src/main/java/io/renren/interceptor/AuthorizationInterceptor.java

@@ -6,13 +6,13 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.interceptor;
9
+package com.api.interceptor;
10 10
 
11 11
 
12
-import io.common.exception.RRException;
13
-import io.renren.annotation.Login;
14
-import io.renren.entity.TokenEntity;
15
-import io.renren.service.TokenService;
12
+import com.common.exception.RRException;
13
+import com.api.annotation.Login;
14
+import com.api.entity.TokenEntity;
15
+import com.api.service.TokenService;
16 16
 import org.apache.commons.lang.StringUtils;
17 17
 import org.springframework.beans.factory.annotation.Autowired;
18 18
 import org.springframework.stereotype.Component;

+ 5 - 5
src/main/java/io/renren/resolver/LoginUserHandlerMethodArgumentResolver.java

@@ -6,12 +6,12 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.resolver;
9
+package com.api.resolver;
10 10
 
11
-import io.renren.annotation.LoginUser;
12
-import io.renren.entity.UserEntity;
13
-import io.renren.interceptor.AuthorizationInterceptor;
14
-import io.renren.service.UserService;
11
+import com.api.annotation.LoginUser;
12
+import com.api.interceptor.AuthorizationInterceptor;
13
+import com.api.entity.UserEntity;
14
+import com.api.service.UserService;
15 15
 import org.springframework.beans.factory.annotation.Autowired;
16 16
 import org.springframework.core.MethodParameter;
17 17
 import org.springframework.stereotype.Component;

+ 2 - 2
src/main/java/io/renren/service/TokenService.java

@@ -6,10 +6,10 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.service;
9
+package com.api.service;
10 10
 
11 11
 import com.baomidou.mybatisplus.extension.service.IService;
12
-import io.renren.entity.TokenEntity;
12
+import com.api.entity.TokenEntity;
13 13
 
14 14
 /**
15 15
  * 用户Token

+ 3 - 3
src/main/java/io/renren/service/UserService.java

@@ -6,11 +6,11 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.service;
9
+package com.api.service;
10 10
 
11 11
 import com.baomidou.mybatisplus.extension.service.IService;
12
-import io.renren.entity.UserEntity;
13
-import io.renren.form.LoginForm;
12
+import com.api.entity.UserEntity;
13
+import com.api.form.LoginForm;
14 14
 
15 15
 import java.util.Map;
16 16
 

+ 4 - 4
src/main/java/io/renren/service/impl/TokenServiceImpl.java

@@ -6,13 +6,13 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.service.impl;
9
+package com.api.service.impl;
10 10
 
11 11
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
12 12
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
13
-import io.renren.dao.TokenDao;
14
-import io.renren.entity.TokenEntity;
15
-import io.renren.service.TokenService;
13
+import com.api.dao.TokenDao;
14
+import com.api.entity.TokenEntity;
15
+import com.api.service.TokenService;
16 16
 import org.springframework.stereotype.Service;
17 17
 
18 18
 import java.util.Date;

+ 9 - 9
src/main/java/io/renren/service/impl/UserServiceImpl.java

@@ -6,19 +6,19 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.renren.service.impl;
9
+package com.api.service.impl;
10 10
 
11 11
 
12 12
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
13 13
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
14
-import io.common.exception.RRException;
15
-import io.common.validator.Assert;
16
-import io.renren.dao.UserDao;
17
-import io.renren.entity.TokenEntity;
18
-import io.renren.entity.UserEntity;
19
-import io.renren.form.LoginForm;
20
-import io.renren.service.TokenService;
21
-import io.renren.service.UserService;
14
+import com.common.exception.RRException;
15
+import com.common.validator.Assert;
16
+import com.api.dao.UserDao;
17
+import com.api.service.TokenService;
18
+import com.api.entity.TokenEntity;
19
+import com.api.entity.UserEntity;
20
+import com.api.form.LoginForm;
21
+import com.api.service.UserService;
22 22
 import org.apache.commons.codec.digest.DigestUtils;
23 23
 import org.springframework.beans.factory.annotation.Autowired;
24 24
 import org.springframework.stereotype.Service;

+ 4 - 4
src/main/java/io/common/aspect/RedisAspect.java

@@ -6,9 +6,9 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.aspect;
9
+package com.common.aspect;
10 10
 
11
-import io.common.exception.RRException;
11
+import com.common.exception.RRException;
12 12
 import org.aspectj.lang.ProceedingJoinPoint;
13 13
 import org.aspectj.lang.annotation.Around;
14 14
 import org.aspectj.lang.annotation.Aspect;
@@ -29,10 +29,10 @@ public class RedisAspect {
29 29
     /**
30 30
      * 是否开启redis缓存  true开启   false关闭
31 31
      */
32
-    @Value("${renren.redis.open: false}")
32
+    @Value("${api.redis.open: false}")
33 33
     private boolean open;
34 34
 
35
-    @Around("execution(* io.common.utils.RedisUtils.*(..))")
35
+    @Around("execution(* com.common.utils.RedisUtils.*(..))")
36 36
     public Object around(ProceedingJoinPoint point) throws Throwable {
37 37
         Object result = null;
38 38
         if(open){

+ 1 - 1
src/main/java/io/common/config/RedisConfig.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.config;
9
+package com.common.config;
10 10
 
11 11
 import org.springframework.beans.factory.annotation.Autowired;
12 12
 import org.springframework.context.annotation.Bean;

+ 1 - 1
src/main/java/io/common/exception/RRException.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.exception;
9
+package com.common.exception;
10 10
 
11 11
 /**
12 12
  * 自定义异常

+ 1 - 1
src/main/java/io/common/utils/DateUtils.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.utils;
9
+package com.common.utils;
10 10
 
11 11
 import org.apache.commons.lang.StringUtils;
12 12
 import org.joda.time.DateTime;

+ 1 - 1
src/main/java/io/common/utils/HttpContextUtils.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.utils;
9
+package com.common.utils;
10 10
 
11 11
 import org.springframework.web.context.request.RequestContextHolder;
12 12
 import org.springframework.web.context.request.ServletRequestAttributes;

+ 1 - 1
src/main/java/io/common/utils/IPUtils.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.utils;
9
+package com.common.utils;
10 10
 
11 11
 import org.apache.commons.lang.StringUtils;
12 12
 import org.slf4j.Logger;

+ 1 - 1
src/main/java/io/common/utils/PageUtils.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.utils;
9
+package com.common.utils;
10 10
 
11 11
 import com.baomidou.mybatisplus.core.metadata.IPage;
12 12
 

+ 1 - 1
src/main/java/io/common/utils/R.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.utils;
9
+package com.common.utils;
10 10
 
11 11
 import java.util.HashMap;
12 12
 import java.util.Map;

+ 1 - 1
src/main/java/io/common/utils/RedisUtils.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.utils;
9
+package com.common.utils;
10 10
 
11 11
 import com.alibaba.fastjson.JSON;
12 12
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
src/main/java/io/common/utils/SpringContextUtils.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.utils;
9
+package com.common.utils;
10 10
 
11 11
 import org.springframework.beans.BeansException;
12 12
 import org.springframework.context.ApplicationContext;

+ 2 - 2
src/main/java/io/common/validator/Assert.java

@@ -6,9 +6,9 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.validator;
9
+package com.common.validator;
10 10
 
11
-import io.common.exception.RRException;
11
+import com.common.exception.RRException;
12 12
 import org.apache.commons.lang.StringUtils;
13 13
 
14 14
 /**

+ 2 - 2
src/main/java/io/common/validator/ValidatorUtils.java

@@ -6,10 +6,10 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.validator;
9
+package com.common.validator;
10 10
 
11 11
 
12
-import io.common.exception.RRException;
12
+import com.common.exception.RRException;
13 13
 
14 14
 import javax.validation.ConstraintViolation;
15 15
 import javax.validation.Validation;

+ 1 - 1
src/main/java/io/common/validator/group/AddGroup.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.validator.group;
9
+package com.common.validator.group;
10 10
 
11 11
 /**
12 12
  * 新增数据 Group

+ 1 - 1
src/main/java/io/common/validator/group/Group.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.validator.group;
9
+package com.common.validator.group;
10 10
 
11 11
 import javax.validation.GroupSequence;
12 12
 

+ 1 - 1
src/main/java/io/common/validator/group/UpdateGroup.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.validator.group;
9
+package com.common.validator.group;
10 10
 
11 11
 /**
12 12
  * 更新数据 Group

+ 1 - 1
src/main/java/io/common/xss/HTMLFilter.java

@@ -1,4 +1,4 @@
1
-package io.common.xss;
1
+package com.common.xss;
2 2
 
3 3
 import java.util.*;
4 4
 import java.util.concurrent.ConcurrentHashMap;

+ 2 - 2
src/main/java/io/common/xss/SQLFilter.java

@@ -6,9 +6,9 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.xss;
9
+package com.common.xss;
10 10
 
11
-import io.common.exception.RRException;
11
+import com.common.exception.RRException;
12 12
 import org.apache.commons.lang.StringUtils;
13 13
 
14 14
 /**

+ 1 - 1
src/main/java/io/common/xss/XssFilter.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.xss;
9
+package com.common.xss;
10 10
 
11 11
 import javax.servlet.*;
12 12
 import javax.servlet.http.HttpServletRequest;

+ 1 - 1
src/main/java/io/common/xss/XssHttpServletRequestWrapper.java

@@ -6,7 +6,7 @@
6 6
  * 版权所有,侵权必究!
7 7
  */
8 8
 
9
-package io.common.xss;
9
+package com.common.xss;
10 10
 
11 11
 import org.apache.commons.io.IOUtils;
12 12
 import org.apache.commons.lang.StringUtils;

+ 1 - 1
src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
3 3
     type: com.alibaba.druid.pool.DruidDataSource
4 4
     druid:
5 5
       driver-class-name: com.mysql.cj.jdbc.Driver
6
-      url: jdbc:mysql://localhost:3306/db1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
6
+      url: jdbc:mysql://localhost:3306/zhengshi?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
7 7
       username: root
8 8
       password:
9 9
       initial-size: 10

+ 1 - 1
src/main/resources/application-prod.yml

@@ -4,7 +4,7 @@ spring:
4 4
     druid:
5 5
       driver-class-name: com.mysql.cj.jdbc.Driver
6 6
       url: jdbc:mysql://localhost:3306/renren_security?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
7
-      username: renren
7
+      username: api
8 8
       password: 123456
9 9
       initial-size: 10
10 10
       max-active: 100

+ 1 - 1
src/main/resources/application-test.yml

@@ -4,7 +4,7 @@ spring:
4 4
     druid:
5 5
       driver-class-name: com.mysql.cj.jdbc.Driver
6 6
       url: jdbc:mysql://localhost:3306/renren_security?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
7
-      username: renren
7
+      username: api
8 8
       password: 123456
9 9
       initial-size: 10
10 10
       max-active: 100

+ 2 - 2
src/main/resources/application.yml

@@ -6,7 +6,7 @@ server:
6 6
     min-spare-threads: 30
7 7
   port: 8081
8 8
 #  servlet:
9
-#    context-path: /renren-api
9
+#    context-path: /api-api
10 10
 
11 11
 # mysql
12 12
 spring:
@@ -40,7 +40,7 @@ renren:
40 40
 mybatis-plus:
41 41
   mapper-locations: classpath*:/mapper/**/*.xml
42 42
   #实体扫描,多个package用逗号或者分号分隔
43
-  typeAliasesPackage: io.renren.entity
43
+  typeAliasesPackage: io.api.entity
44 44
   global-config:
45 45
     #数据库相关配置
46 46
     db-config:

+ 1 - 1
src/main/resources/mapper/TokenDao.xml

@@ -1,6 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3
 
4
-<mapper namespace="io.renren.dao.TokenDao">
4
+<mapper namespace="com.renren.dao.TokenDao">
5 5
 
6 6
 </mapper>

+ 1 - 1
src/main/resources/mapper/UserDao.xml

@@ -1,7 +1,7 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3
 
4
-<mapper namespace="io.renren.dao.UserDao">
4
+<mapper namespace="com.renren.dao.UserDao">
5 5
 
6 6
 
7 7
 </mapper>