فهرست منبع

数据库/oss

licailing 4 سال پیش
والد
کامیت
629c312c69
100فایلهای تغییر یافته به همراه364 افزوده شده و 189 حذف شده
  1. 3 3
      pom.xml
  2. 1 1
      src/main/java/com/izouma/campusTakeaway/Application.java
  3. 45 0
      src/main/java/com/izouma/campusTakeaway/annotations/EnumFormat.java
  4. 1 1
      src/main/java/com/izouma/campusTakeaway/annotations/OperLog.java
  5. 1 1
      src/main/java/com/izouma/campusTakeaway/annotations/Searchable.java
  6. 11 11
      src/main/java/com/izouma/campusTakeaway/aspect/OperLogAspect.java
  7. 1 1
      src/main/java/com/izouma/campusTakeaway/config/CacheConfig.java
  8. 1 1
      src/main/java/com/izouma/campusTakeaway/config/Constants.java
  9. 1 1
      src/main/java/com/izouma/campusTakeaway/config/DateConfig.java
  10. 1 1
      src/main/java/com/izouma/campusTakeaway/config/LocalDateTimeSerializerConfig.java
  11. 3 3
      src/main/java/com/izouma/campusTakeaway/config/SpringSecurityAuditorAware.java
  12. 1 1
      src/main/java/com/izouma/campusTakeaway/config/WebMvcConfig.java
  13. 1 1
      src/main/java/com/izouma/campusTakeaway/config/WxMaConfiguration.java
  14. 1 1
      src/main/java/com/izouma/campusTakeaway/config/WxMaProperties.java
  15. 2 2
      src/main/java/com/izouma/campusTakeaway/config/WxMpConfiguration.java
  16. 1 1
      src/main/java/com/izouma/campusTakeaway/config/WxMpProperties.java
  17. 1 1
      src/main/java/com/izouma/campusTakeaway/config/WxPayConfiguration.java
  18. 1 1
      src/main/java/com/izouma/campusTakeaway/config/WxPayProperties.java
  19. 2 2
      src/main/java/com/izouma/campusTakeaway/converter/FileObjectConverter.java
  20. 2 2
      src/main/java/com/izouma/campusTakeaway/converter/FileObjectListConverter.java
  21. 1 1
      src/main/java/com/izouma/campusTakeaway/converter/JSONObjectConverter.java
  22. 1 1
      src/main/java/com/izouma/campusTakeaway/converter/LongArrayConverter.java
  23. 1 1
      src/main/java/com/izouma/campusTakeaway/converter/StringArrayConverter.java
  24. 1 1
      src/main/java/com/izouma/campusTakeaway/converter/StringToMapConverter.java
  25. 1 1
      src/main/java/com/izouma/campusTakeaway/domain/AuditedEntity.java
  26. 1 1
      src/main/java/com/izouma/campusTakeaway/domain/BaseEntity.java
  27. 3 3
      src/main/java/com/izouma/campusTakeaway/domain/District.java
  28. 1 1
      src/main/java/com/izouma/campusTakeaway/domain/ExceptionLog.java
  29. 1 1
      src/main/java/com/izouma/campusTakeaway/domain/FileObject.java
  30. 3 3
      src/main/java/com/izouma/campusTakeaway/domain/Menu.java
  31. 1 1
      src/main/java/com/izouma/campusTakeaway/domain/OperationLog.java
  32. 20 0
      src/main/java/com/izouma/campusTakeaway/domain/Restaurant.java
  33. 28 0
      src/main/java/com/izouma/campusTakeaway/domain/School.java
  34. 1 1
      src/main/java/com/izouma/campusTakeaway/domain/SmsRecord.java
  35. 4 4
      src/main/java/com/izouma/campusTakeaway/domain/SuperUser.java
  36. 1 1
      src/main/java/com/izouma/campusTakeaway/domain/SysConfig.java
  37. 1 1
      src/main/java/com/izouma/campusTakeaway/domain/TestClass.java
  38. 4 7
      src/main/java/com/izouma/campusTakeaway/domain/User.java
  39. 16 0
      src/main/java/com/izouma/campusTakeaway/domain/merchant/Merchant.java
  40. 1 2
      src/main/java/com/izouma/campusTakeaway/dto/Captcha.java
  41. 1 1
      src/main/java/com/izouma/campusTakeaway/dto/MenuDTO.java
  42. 1 1
      src/main/java/com/izouma/campusTakeaway/dto/PageQuery.java
  43. 2 2
      src/main/java/com/izouma/campusTakeaway/dto/UserRegister.java
  44. 1 1
      src/main/java/com/izouma/campusTakeaway/dto/gen/GenCode.java
  45. 1 1
      src/main/java/com/izouma/campusTakeaway/dto/gen/Subtable.java
  46. 1 1
      src/main/java/com/izouma/campusTakeaway/dto/gen/TableField.java
  47. 1 1
      src/main/java/com/izouma/campusTakeaway/enums/AuthorityName.java
  48. 1 1
      src/main/java/com/izouma/campusTakeaway/enums/DistrictLevel.java
  49. 1 1
      src/main/java/com/izouma/campusTakeaway/exception/AuthenticationException.java
  50. 1 1
      src/main/java/com/izouma/campusTakeaway/exception/BusinessException.java
  51. 1 1
      src/main/java/com/izouma/campusTakeaway/exception/GlobalExceptionHandler.java
  52. 1 1
      src/main/java/com/izouma/campusTakeaway/mpHandler/LogHandler.java
  53. 2 2
      src/main/java/com/izouma/campusTakeaway/repo/AuthorityRepo.java
  54. 2 2
      src/main/java/com/izouma/campusTakeaway/repo/DistrictRepo.java
  55. 2 2
      src/main/java/com/izouma/campusTakeaway/repo/ExceptionLogRepo.java
  56. 3 4
      src/main/java/com/izouma/campusTakeaway/repo/MenuRepo.java
  57. 2 2
      src/main/java/com/izouma/campusTakeaway/repo/OperationLogRepo.java
  58. 2 2
      src/main/java/com/izouma/campusTakeaway/repo/SmsRecordRepo.java
  59. 2 2
      src/main/java/com/izouma/campusTakeaway/repo/SysConfigRepo.java
  60. 2 2
      src/main/java/com/izouma/campusTakeaway/repo/TestClassRepo.java
  61. 3 3
      src/main/java/com/izouma/campusTakeaway/repo/UserRepo.java
  62. 2 2
      src/main/java/com/izouma/campusTakeaway/security/Authority.java
  63. 1 1
      src/main/java/com/izouma/campusTakeaway/security/JwtAuthenticationEntryPoint.java
  64. 1 1
      src/main/java/com/izouma/campusTakeaway/security/JwtAuthorizationTokenFilter.java
  65. 1 1
      src/main/java/com/izouma/campusTakeaway/security/JwtConfig.java
  66. 1 1
      src/main/java/com/izouma/campusTakeaway/security/JwtTokenUtil.java
  67. 2 2
      src/main/java/com/izouma/campusTakeaway/security/JwtUser.java
  68. 3 3
      src/main/java/com/izouma/campusTakeaway/security/JwtUserDetailsService.java
  69. 2 2
      src/main/java/com/izouma/campusTakeaway/security/JwtUserFactory.java
  70. 1 1
      src/main/java/com/izouma/campusTakeaway/security/WebSecurityConfig.java
  71. 2 4
      src/main/java/com/izouma/campusTakeaway/service/CaptchaService.java
  72. 6 6
      src/main/java/com/izouma/campusTakeaway/service/DistrictService.java
  73. 2 2
      src/main/java/com/izouma/campusTakeaway/service/ExceptionLogService.java
  74. 3 4
      src/main/java/com/izouma/campusTakeaway/service/GenCodeService.java
  75. 2 2
      src/main/java/com/izouma/campusTakeaway/service/OperationLogService.java
  76. 6 6
      src/main/java/com/izouma/campusTakeaway/service/SysConfigService.java
  77. 5 5
      src/main/java/com/izouma/campusTakeaway/service/TestClassService.java
  78. 13 13
      src/main/java/com/izouma/campusTakeaway/service/UserService.java
  79. 5 5
      src/main/java/com/izouma/campusTakeaway/service/sms/AliSmsService.java
  80. 1 1
      src/main/java/com/izouma/campusTakeaway/service/sms/SmsService.java
  81. 2 2
      src/main/java/com/izouma/campusTakeaway/service/storage/AliStorageService.java
  82. 2 2
      src/main/java/com/izouma/campusTakeaway/service/storage/LocalStorageService.java
  83. 1 1
      src/main/java/com/izouma/campusTakeaway/service/storage/StorageService.java
  84. 1 1
      src/main/java/com/izouma/campusTakeaway/utils/DateTimeUtils.java
  85. 1 1
      src/main/java/com/izouma/campusTakeaway/utils/FileUtils.java
  86. 1 1
      src/main/java/com/izouma/campusTakeaway/utils/IPUtils.java
  87. 1 1
      src/main/java/com/izouma/campusTakeaway/utils/ImageUtils.java
  88. 3 3
      src/main/java/com/izouma/campusTakeaway/utils/JpaUtils.java
  89. 1 1
      src/main/java/com/izouma/campusTakeaway/utils/JsonUtils.java
  90. 1 1
      src/main/java/com/izouma/campusTakeaway/utils/NullAwareBeanUtilsBean.java
  91. 1 1
      src/main/java/com/izouma/campusTakeaway/utils/ObjUtils.java
  92. 1 1
      src/main/java/com/izouma/campusTakeaway/utils/PinYinUtil.java
  93. 3 3
      src/main/java/com/izouma/campusTakeaway/utils/SecurityUtils.java
  94. 1 1
      src/main/java/com/izouma/campusTakeaway/utils/SnowflakeIdWorker.java
  95. 1 1
      src/main/java/com/izouma/campusTakeaway/utils/ThreadTask.java
  96. 1 1
      src/main/java/com/izouma/campusTakeaway/utils/amap/DistrictsItem.java
  97. 1 1
      src/main/java/com/izouma/campusTakeaway/utils/amap/QueryDistrictResponse.java
  98. 1 1
      src/main/java/com/izouma/campusTakeaway/utils/amap/Suggestion.java
  99. 75 0
      src/main/java/com/izouma/campusTakeaway/utils/excel/EnumExcelConverter.java
  100. 1 2
      src/main/java/com/izouma/campusTakeaway/utils/excel/ExcelUtils.java

+ 3 - 3
pom.xml

@@ -9,10 +9,10 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.izouma</groupId>
-    <artifactId>awesomeAdmin</artifactId>
+    <artifactId>campusTakeaway</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>awesome-admin</name>
-    <description>awesome-admin</description>
+    <name>campus-takeaway</name>
+    <description>campus-takeaway</description>
 
     <repositories>
         <repository>

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/Application.java → src/main/java/com/izouma/campusTakeaway/Application.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin;
+package com.izouma.campusTakeaway;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

+ 45 - 0
src/main/java/com/izouma/campusTakeaway/annotations/EnumFormat.java

@@ -0,0 +1,45 @@
+package com.izouma.zhirongip.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * <pre>
+ * '@EnumFormat 注解 :
+ *  作用 : 用于自定义excel单元格中的内容,转换成对应的枚举值
+ *  属性 :
+ *      value : 要转换的枚举类型
+ *      fromExcel : 指定excel中用户输入的枚举值,可以与toJavaEnum中指定的枚举值一一对应
+ *                  例如 : excel 单元格中输入
+ *                         '待支付' -> OrderStatusEnum.UNPAY
+ *                         '已支付' -> OrderStatusEnum.PAYED
+ *      toJavaEnum : 如上所述
+ *  注意 : toJavaEnum 与 fromExcel 必须搭配使用
+ * </pre>
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnumFormat {
+    /**
+     * 要转换的枚举类型
+     *
+     * @return enum class
+     */
+    Class value();
+
+    /**
+     * 要转换枚举的全部变量名数组集
+     *
+     * @return String[]
+     */
+    String[] toJavaEnum() default {};
+
+    /**
+     * 枚举导出excel时所展示的内容
+     *
+     * @return String[]
+     */
+    String[] fromExcel() default {};
+}

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/annotations/OperLog.java → src/main/java/com/izouma/campusTakeaway/annotations/OperLog.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.annotations;
+package com.izouma.campusTakeaway.annotations;
 
 import java.lang.annotation.*;
 

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/annotations/Searchable.java → src/main/java/com/izouma/campusTakeaway/annotations/Searchable.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.annotations;
+package com.izouma.campusTakeaway.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

+ 11 - 11
src/main/java/com/izouma/awesomeAdmin/aspect/OperLogAspect.java → src/main/java/com/izouma/campusTakeaway/aspect/OperLogAspect.java

@@ -1,14 +1,14 @@
-package com.izouma.awesomeAdmin.aspect;
+package com.izouma.campusTakeaway.aspect;
 
 import com.alibaba.fastjson.JSON;
-import com.izouma.awesomeAdmin.annotations.OperLog;
-import com.izouma.awesomeAdmin.domain.ExceptionLog;
-import com.izouma.awesomeAdmin.domain.OperationLog;
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.repo.ExceptionLogRepo;
-import com.izouma.awesomeAdmin.repo.OperationLogRepo;
-import com.izouma.awesomeAdmin.utils.IPUtils;
-import com.izouma.awesomeAdmin.utils.SecurityUtils;
+import com.izouma.campusTakeaway.annotations.OperLog;
+import com.izouma.campusTakeaway.domain.ExceptionLog;
+import com.izouma.campusTakeaway.domain.OperationLog;
+import com.izouma.campusTakeaway.domain.User;
+import com.izouma.campusTakeaway.repo.ExceptionLogRepo;
+import com.izouma.campusTakeaway.repo.OperationLogRepo;
+import com.izouma.campusTakeaway.utils.IPUtils;
+import com.izouma.campusTakeaway.utils.SecurityUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.AfterThrowing;
@@ -39,14 +39,14 @@ public class OperLogAspect {
     /**
      * 设置操作日志切入点 记录操作日志 在注解的位置切入代码
      */
-    @Pointcut("@annotation(com.izouma.awesomeAdmin.annotations.OperLog)")
+    @Pointcut("@annotation(com.izouma.campusTakeaway.annotations.OperLog)")
     public void operLogPointCut() {
     }
 
     /**
      * 设置操作异常切入点记录异常日志 扫描所有controller包下操作
      */
-    @Pointcut("execution(* com.izouma.awesomeAdmin.web..*.*(..))")
+    @Pointcut("execution(* com.izouma.campusTakeaway.web..*.*(..))")
     public void operExceptionLogPointCut() {
     }
 

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/config/CacheConfig.java → src/main/java/com/izouma/campusTakeaway/config/CacheConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.campusTakeaway.config;
 
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/config/Constants.java → src/main/java/com/izouma/campusTakeaway/config/Constants.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.campusTakeaway.config;
 
 public interface Constants {
 

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/config/DateConfig.java → src/main/java/com/izouma/campusTakeaway/config/DateConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.campusTakeaway.config;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/config/LocalDateTimeSerializerConfig.java → src/main/java/com/izouma/campusTakeaway/config/LocalDateTimeSerializerConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.campusTakeaway.config;
 
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;

+ 3 - 3
src/main/java/com/izouma/awesomeAdmin/config/SpringSecurityAuditorAware.java → src/main/java/com/izouma/campusTakeaway/config/SpringSecurityAuditorAware.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.campusTakeaway.config;
 
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.utils.SecurityUtils;
+import com.izouma.campusTakeaway.domain.User;
+import com.izouma.campusTakeaway.utils.SecurityUtils;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.stereotype.Component;
 

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/config/WebMvcConfig.java → src/main/java/com/izouma/campusTakeaway/config/WebMvcConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.campusTakeaway.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/config/WxMaConfiguration.java → src/main/java/com/izouma/campusTakeaway/config/WxMaConfiguration.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.campusTakeaway.config;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/config/WxMaProperties.java → src/main/java/com/izouma/campusTakeaway/config/WxMaProperties.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.campusTakeaway.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/config/WxMpConfiguration.java → src/main/java/com/izouma/campusTakeaway/config/WxMpConfiguration.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.campusTakeaway.config;
 
-import com.izouma.awesomeAdmin.mpHandler.LogHandler;
+import com.izouma.campusTakeaway.mpHandler.LogHandler;
 import lombok.AllArgsConstructor;
 import me.chanjar.weixin.mp.api.WxMpMessageRouter;
 import me.chanjar.weixin.mp.api.WxMpService;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/config/WxMpProperties.java → src/main/java/com/izouma/campusTakeaway/config/WxMpProperties.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.campusTakeaway.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/config/WxPayConfiguration.java → src/main/java/com/izouma/campusTakeaway/config/WxPayConfiguration.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.campusTakeaway.config;
 
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.service.WxPayService;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/config/WxPayProperties.java → src/main/java/com/izouma/campusTakeaway/config/WxPayProperties.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.campusTakeaway.config;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/converter/FileObjectConverter.java → src/main/java/com/izouma/campusTakeaway/converter/FileObjectConverter.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.converter;
+package com.izouma.campusTakeaway.converter;
 
 import com.alibaba.fastjson.JSON;
-import com.izouma.awesomeAdmin.domain.FileObject;
+import com.izouma.campusTakeaway.domain.FileObject;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.persistence.AttributeConverter;

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/converter/FileObjectListConverter.java → src/main/java/com/izouma/campusTakeaway/converter/FileObjectListConverter.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.converter;
+package com.izouma.campusTakeaway.converter;
 
 import com.alibaba.fastjson.JSON;
-import com.izouma.awesomeAdmin.domain.FileObject;
+import com.izouma.campusTakeaway.domain.FileObject;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.persistence.AttributeConverter;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/converter/JSONObjectConverter.java → src/main/java/com/izouma/campusTakeaway/converter/JSONObjectConverter.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.converter;
+package com.izouma.campusTakeaway.converter;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/converter/LongArrayConverter.java → src/main/java/com/izouma/campusTakeaway/converter/LongArrayConverter.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.converter;
+package com.izouma.campusTakeaway.converter;
 
 import org.apache.commons.lang3.StringUtils;
 

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/converter/StringArrayConverter.java → src/main/java/com/izouma/campusTakeaway/converter/StringArrayConverter.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.converter;
+package com.izouma.campusTakeaway.converter;
 
 import org.apache.commons.lang3.StringUtils;
 

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/converter/StringToMapConverter.java → src/main/java/com/izouma/campusTakeaway/converter/StringToMapConverter.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.converter;
+package com.izouma.campusTakeaway.converter;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/domain/AuditedEntity.java → src/main/java/com/izouma/campusTakeaway/domain/AuditedEntity.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.campusTakeaway.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/domain/BaseEntity.java → src/main/java/com/izouma/campusTakeaway/domain/BaseEntity.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.campusTakeaway.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

+ 3 - 3
src/main/java/com/izouma/awesomeAdmin/domain/District.java → src/main/java/com/izouma/campusTakeaway/domain/District.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.campusTakeaway.domain;
 
-import com.izouma.awesomeAdmin.annotations.Searchable;
-import com.izouma.awesomeAdmin.enums.DistrictLevel;
+import com.izouma.campusTakeaway.annotations.Searchable;
+import com.izouma.campusTakeaway.enums.DistrictLevel;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/domain/ExceptionLog.java → src/main/java/com/izouma/campusTakeaway/domain/ExceptionLog.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.campusTakeaway.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/domain/FileObject.java → src/main/java/com/izouma/campusTakeaway/domain/FileObject.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.campusTakeaway.domain;
 
 import lombok.Data;
 

+ 3 - 3
src/main/java/com/izouma/awesomeAdmin/domain/Menu.java → src/main/java/com/izouma/campusTakeaway/domain/Menu.java

@@ -1,8 +1,8 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.campusTakeaway.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
-import com.izouma.awesomeAdmin.dto.MenuDTO;
-import com.izouma.awesomeAdmin.security.Authority;
+import com.izouma.campusTakeaway.dto.MenuDTO;
+import com.izouma.campusTakeaway.security.Authority;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/domain/OperationLog.java → src/main/java/com/izouma/campusTakeaway/domain/OperationLog.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.campusTakeaway.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;

+ 20 - 0
src/main/java/com/izouma/campusTakeaway/domain/Restaurant.java

@@ -0,0 +1,20 @@
+package com.izouma.campusTakeaway.domain;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "餐厅管理")
+@Where(clause = "del = 0")
+public class Restaurant extends BaseEntity {
+    private Long schoolId;
+
+    private String name;
+}

+ 28 - 0
src/main/java/com/izouma/campusTakeaway/domain/School.java

@@ -0,0 +1,28 @@
+package com.izouma.campusTakeaway.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "校区管理")
+@Where(clause = "del = 0")
+public class School extends BaseEntity {
+
+    @ApiModelProperty(value = "学校名称")
+    private String name;
+
+    @ApiModelProperty(value = "学校地址")
+    private String address;
+
+    private double lat;
+
+    private double lon;
+}

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/domain/SmsRecord.java → src/main/java/com/izouma/campusTakeaway/domain/SmsRecord.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.campusTakeaway.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 4 - 4
src/main/java/com/izouma/awesomeAdmin/domain/SuperUser.java → src/main/java/com/izouma/campusTakeaway/domain/SuperUser.java

@@ -1,10 +1,10 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.campusTakeaway.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.izouma.awesomeAdmin.annotations.Searchable;
-import com.izouma.awesomeAdmin.config.Constants;
-import com.izouma.awesomeAdmin.security.Authority;
+import com.izouma.campusTakeaway.annotations.Searchable;
+import com.izouma.campusTakeaway.config.Constants;
+import com.izouma.campusTakeaway.security.Authority;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/domain/SysConfig.java → src/main/java/com/izouma/campusTakeaway/domain/SysConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.campusTakeaway.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/domain/TestClass.java → src/main/java/com/izouma/campusTakeaway/domain/TestClass.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.campusTakeaway.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 4 - 7
src/main/java/com/izouma/awesomeAdmin/domain/User.java → src/main/java/com/izouma/campusTakeaway/domain/User.java

@@ -1,12 +1,10 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.campusTakeaway.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.izouma.awesomeAdmin.annotations.Searchable;
-import com.izouma.awesomeAdmin.config.Constants;
-import com.izouma.awesomeAdmin.converter.FileObjectConverter;
-import com.izouma.awesomeAdmin.converter.FileObjectListConverter;
-import com.izouma.awesomeAdmin.security.Authority;
+import com.izouma.campusTakeaway.annotations.Searchable;
+import com.izouma.campusTakeaway.config.Constants;
+import com.izouma.campusTakeaway.security.Authority;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -19,7 +17,6 @@ import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 @Data

+ 16 - 0
src/main/java/com/izouma/campusTakeaway/domain/merchant/Merchant.java

@@ -0,0 +1,16 @@
+package com.izouma.campusTakeaway.domain.merchant;
+
+import com.izouma.campusTakeaway.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+
+public class Merchant extends BaseEntity {
+    @ApiModelProperty("商家名称")
+    private String name;
+
+    @ApiModelProperty("校区id")
+    private String schoolId;
+
+    @ApiModelProperty("餐厅id")
+    private String restaurantId;
+
+}

+ 1 - 2
src/main/java/com/izouma/awesomeAdmin/dto/Captcha.java → src/main/java/com/izouma/campusTakeaway/dto/Captcha.java

@@ -1,7 +1,6 @@
-package com.izouma.awesomeAdmin.dto;
+package com.izouma.campusTakeaway.dto;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 
 @Data

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/dto/MenuDTO.java → src/main/java/com/izouma/campusTakeaway/dto/MenuDTO.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.dto;
+package com.izouma.campusTakeaway.dto;
 
 public interface MenuDTO {
     Long getId();

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/dto/PageQuery.java → src/main/java/com/izouma/campusTakeaway/dto/PageQuery.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.dto;
+package com.izouma.campusTakeaway.dto;
 
 import lombok.Data;
 

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/dto/UserRegister.java → src/main/java/com/izouma/campusTakeaway/dto/UserRegister.java

@@ -1,8 +1,8 @@
-package com.izouma.awesomeAdmin.dto;
+package com.izouma.campusTakeaway.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.izouma.awesomeAdmin.security.Authority;
+import com.izouma.campusTakeaway.security.Authority;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/dto/gen/GenCode.java → src/main/java/com/izouma/campusTakeaway/dto/gen/GenCode.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.dto.gen;
+package com.izouma.campusTakeaway.dto.gen;
 
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/dto/gen/Subtable.java → src/main/java/com/izouma/campusTakeaway/dto/gen/Subtable.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.dto.gen;
+package com.izouma.campusTakeaway.dto.gen;
 
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/dto/gen/TableField.java → src/main/java/com/izouma/campusTakeaway/dto/gen/TableField.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.dto.gen;
+package com.izouma.campusTakeaway.dto.gen;
 
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/enums/AuthorityName.java → src/main/java/com/izouma/campusTakeaway/enums/AuthorityName.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.enums;
+package com.izouma.campusTakeaway.enums;
 
 public enum AuthorityName {
     ROLE_USER("普通用户"),

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/enums/DistrictLevel.java → src/main/java/com/izouma/campusTakeaway/enums/DistrictLevel.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.enums;
+package com.izouma.campusTakeaway.enums;
 
 public enum DistrictLevel {
     PROVINCE(1),

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/exception/AuthenticationException.java → src/main/java/com/izouma/campusTakeaway/exception/AuthenticationException.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.exception;
+package com.izouma.campusTakeaway.exception;
 
 public class AuthenticationException extends RuntimeException {
     public AuthenticationException(String message, Throwable cause) {

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/exception/BusinessException.java → src/main/java/com/izouma/campusTakeaway/exception/BusinessException.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.exception;
+package com.izouma.campusTakeaway.exception;
 
 import java.util.function.Supplier;
 

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/exception/GlobalExceptionHandler.java → src/main/java/com/izouma/campusTakeaway/exception/GlobalExceptionHandler.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.exception;
+package com.izouma.campusTakeaway.exception;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/mpHandler/LogHandler.java → src/main/java/com/izouma/campusTakeaway/mpHandler/LogHandler.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.mpHandler;
+package com.izouma.campusTakeaway.mpHandler;
 
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.session.WxSessionManager;

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/repo/AuthorityRepo.java → src/main/java/com/izouma/campusTakeaway/repo/AuthorityRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.campusTakeaway.repo;
 
-import com.izouma.awesomeAdmin.security.Authority;
+import com.izouma.campusTakeaway.security.Authority;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface AuthorityRepo extends JpaRepository<Authority, String> {

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/repo/DistrictRepo.java → src/main/java/com/izouma/campusTakeaway/repo/DistrictRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.campusTakeaway.repo;
 
-import com.izouma.awesomeAdmin.domain.District;
+import com.izouma.campusTakeaway.domain.District;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/repo/ExceptionLogRepo.java → src/main/java/com/izouma/campusTakeaway/repo/ExceptionLogRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.campusTakeaway.repo;
 
-import com.izouma.awesomeAdmin.domain.ExceptionLog;
+import com.izouma.campusTakeaway.domain.ExceptionLog;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

+ 3 - 4
src/main/java/com/izouma/awesomeAdmin/repo/MenuRepo.java → src/main/java/com/izouma/campusTakeaway/repo/MenuRepo.java

@@ -1,8 +1,7 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.campusTakeaway.repo;
 
-import com.izouma.awesomeAdmin.domain.Menu;
-import com.izouma.awesomeAdmin.dto.MenuDTO;
-import org.hibernate.annotations.Where;
+import com.izouma.campusTakeaway.domain.Menu;
+import com.izouma.campusTakeaway.dto.MenuDTO;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/repo/OperationLogRepo.java → src/main/java/com/izouma/campusTakeaway/repo/OperationLogRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.campusTakeaway.repo;
 
-import com.izouma.awesomeAdmin.domain.OperationLog;
+import com.izouma.campusTakeaway.domain.OperationLog;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/repo/SmsRecordRepo.java → src/main/java/com/izouma/campusTakeaway/repo/SmsRecordRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.campusTakeaway.repo;
 
-import com.izouma.awesomeAdmin.domain.SmsRecord;
+import com.izouma.campusTakeaway.domain.SmsRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/repo/SysConfigRepo.java → src/main/java/com/izouma/campusTakeaway/repo/SysConfigRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.campusTakeaway.repo;
 
-import com.izouma.awesomeAdmin.domain.SysConfig;
+import com.izouma.campusTakeaway.domain.SysConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/repo/TestClassRepo.java → src/main/java/com/izouma/campusTakeaway/repo/TestClassRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.campusTakeaway.repo;
 
-import com.izouma.awesomeAdmin.domain.TestClass;
+import com.izouma.campusTakeaway.domain.TestClass;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

+ 3 - 3
src/main/java/com/izouma/awesomeAdmin/repo/UserRepo.java → src/main/java/com/izouma/campusTakeaway/repo/UserRepo.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.campusTakeaway.repo;
 
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.security.Authority;
+import com.izouma.campusTakeaway.domain.User;
+import com.izouma.campusTakeaway.security.Authority;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/security/Authority.java → src/main/java/com/izouma/campusTakeaway/security/Authority.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.campusTakeaway.security;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.izouma.awesomeAdmin.enums.AuthorityName;
+import com.izouma.campusTakeaway.enums.AuthorityName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/security/JwtAuthenticationEntryPoint.java → src/main/java/com/izouma/campusTakeaway/security/JwtAuthenticationEntryPoint.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.campusTakeaway.security;
 
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/security/JwtAuthorizationTokenFilter.java → src/main/java/com/izouma/campusTakeaway/security/JwtAuthorizationTokenFilter.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.campusTakeaway.security;
 
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.SignatureException;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/security/JwtConfig.java → src/main/java/com/izouma/campusTakeaway/security/JwtConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.campusTakeaway.security;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/security/JwtTokenUtil.java → src/main/java/com/izouma/campusTakeaway/security/JwtTokenUtil.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.campusTakeaway.security;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.jsonwebtoken.Claims;

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/security/JwtUser.java → src/main/java/com/izouma/campusTakeaway/security/JwtUser.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.campusTakeaway.security;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.izouma.awesomeAdmin.domain.User;
+import com.izouma.campusTakeaway.domain.User;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 

+ 3 - 3
src/main/java/com/izouma/awesomeAdmin/security/JwtUserDetailsService.java → src/main/java/com/izouma/campusTakeaway/security/JwtUserDetailsService.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.campusTakeaway.security;
 
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.repo.UserRepo;
+import com.izouma.campusTakeaway.domain.User;
+import com.izouma.campusTakeaway.repo.UserRepo;
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/security/JwtUserFactory.java → src/main/java/com/izouma/campusTakeaway/security/JwtUserFactory.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.campusTakeaway.security;
 
-import com.izouma.awesomeAdmin.domain.User;
+import com.izouma.campusTakeaway.domain.User;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/security/WebSecurityConfig.java → src/main/java/com/izouma/campusTakeaway/security/WebSecurityConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.campusTakeaway.security;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

+ 2 - 4
src/main/java/com/izouma/awesomeAdmin/service/CaptchaService.java → src/main/java/com/izouma/campusTakeaway/service/CaptchaService.java

@@ -1,19 +1,17 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.campusTakeaway.service;
 
-import com.izouma.awesomeAdmin.dto.Captcha;
+import com.izouma.campusTakeaway.dto.Captcha;
 import com.wf.captcha.SpecCaptcha;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.ehcache.UserManagedCache;
 import org.ehcache.config.builders.ExpiryPolicyBuilder;
 import org.ehcache.config.builders.UserManagedCacheBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.awt.*;
 import java.io.IOException;
 import java.time.Duration;
-import java.util.Objects;
 import java.util.UUID;
 
 @Service

+ 6 - 6
src/main/java/com/izouma/awesomeAdmin/service/DistrictService.java → src/main/java/com/izouma/campusTakeaway/service/DistrictService.java

@@ -1,12 +1,12 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.campusTakeaway.service;
 
 import com.alibaba.fastjson.JSON;
 import com.github.kevinsawicki.http.HttpRequest;
-import com.izouma.awesomeAdmin.domain.District;
-import com.izouma.awesomeAdmin.enums.DistrictLevel;
-import com.izouma.awesomeAdmin.repo.DistrictRepo;
-import com.izouma.awesomeAdmin.utils.amap.DistrictsItem;
-import com.izouma.awesomeAdmin.utils.amap.QueryDistrictResponse;
+import com.izouma.campusTakeaway.domain.District;
+import com.izouma.campusTakeaway.enums.DistrictLevel;
+import com.izouma.campusTakeaway.repo.DistrictRepo;
+import com.izouma.campusTakeaway.utils.amap.DistrictsItem;
+import com.izouma.campusTakeaway.utils.amap.QueryDistrictResponse;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.jpa.domain.Specification;

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/service/ExceptionLogService.java → src/main/java/com/izouma/campusTakeaway/service/ExceptionLogService.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.campusTakeaway.service;
 
-import com.izouma.awesomeAdmin.repo.ExceptionLogRepo;
+import com.izouma.campusTakeaway.repo.ExceptionLogRepo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 

+ 3 - 4
src/main/java/com/izouma/awesomeAdmin/service/GenCodeService.java → src/main/java/com/izouma/campusTakeaway/service/GenCodeService.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.campusTakeaway.service;
 
-import com.izouma.awesomeAdmin.dto.gen.GenCode;
-import com.izouma.awesomeAdmin.dto.gen.TableField;
+import com.izouma.campusTakeaway.dto.gen.GenCode;
+import com.izouma.campusTakeaway.dto.gen.TableField;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
@@ -15,7 +15,6 @@ import java.awt.*;
 import java.awt.font.FontRenderContext;
 import java.awt.geom.AffineTransform;
 import java.io.*;
-import java.lang.reflect.Field;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/service/OperationLogService.java → src/main/java/com/izouma/campusTakeaway/service/OperationLogService.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.campusTakeaway.service;
 
-import com.izouma.awesomeAdmin.repo.OperationLogRepo;
+import com.izouma.campusTakeaway.repo.OperationLogRepo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 

+ 6 - 6
src/main/java/com/izouma/awesomeAdmin/service/SysConfigService.java → src/main/java/com/izouma/campusTakeaway/service/SysConfigService.java

@@ -1,10 +1,10 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.campusTakeaway.service;
 
-import com.izouma.awesomeAdmin.domain.SysConfig;
-import com.izouma.awesomeAdmin.dto.PageQuery;
-import com.izouma.awesomeAdmin.exception.BusinessException;
-import com.izouma.awesomeAdmin.repo.SysConfigRepo;
-import com.izouma.awesomeAdmin.utils.JpaUtils;
+import com.izouma.campusTakeaway.domain.SysConfig;
+import com.izouma.campusTakeaway.dto.PageQuery;
+import com.izouma.campusTakeaway.exception.BusinessException;
+import com.izouma.campusTakeaway.repo.SysConfigRepo;
+import com.izouma.campusTakeaway.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;

+ 5 - 5
src/main/java/com/izouma/awesomeAdmin/service/TestClassService.java → src/main/java/com/izouma/campusTakeaway/service/TestClassService.java

@@ -1,9 +1,9 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.campusTakeaway.service;
 
-import com.izouma.awesomeAdmin.domain.TestClass;
-import com.izouma.awesomeAdmin.dto.PageQuery;
-import com.izouma.awesomeAdmin.repo.TestClassRepo;
-import com.izouma.awesomeAdmin.utils.JpaUtils;
+import com.izouma.campusTakeaway.domain.TestClass;
+import com.izouma.campusTakeaway.dto.PageQuery;
+import com.izouma.campusTakeaway.repo.TestClassRepo;
+import com.izouma.campusTakeaway.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;

+ 13 - 13
src/main/java/com/izouma/awesomeAdmin/service/UserService.java → src/main/java/com/izouma/campusTakeaway/service/UserService.java

@@ -1,20 +1,20 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.campusTakeaway.service;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
-import com.izouma.awesomeAdmin.config.Constants;
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.dto.PageQuery;
-import com.izouma.awesomeAdmin.dto.UserRegister;
-import com.izouma.awesomeAdmin.exception.BusinessException;
-import com.izouma.awesomeAdmin.repo.UserRepo;
-import com.izouma.awesomeAdmin.security.Authority;
-import com.izouma.awesomeAdmin.security.JwtTokenUtil;
-import com.izouma.awesomeAdmin.security.JwtUserFactory;
-import com.izouma.awesomeAdmin.service.sms.SmsService;
-import com.izouma.awesomeAdmin.service.storage.StorageService;
-import com.izouma.awesomeAdmin.utils.JpaUtils;
+import com.izouma.campusTakeaway.config.Constants;
+import com.izouma.campusTakeaway.domain.User;
+import com.izouma.campusTakeaway.dto.PageQuery;
+import com.izouma.campusTakeaway.dto.UserRegister;
+import com.izouma.campusTakeaway.exception.BusinessException;
+import com.izouma.campusTakeaway.repo.UserRepo;
+import com.izouma.campusTakeaway.security.Authority;
+import com.izouma.campusTakeaway.security.JwtTokenUtil;
+import com.izouma.campusTakeaway.security.JwtUserFactory;
+import com.izouma.campusTakeaway.service.sms.SmsService;
+import com.izouma.campusTakeaway.service.storage.StorageService;
+import com.izouma.campusTakeaway.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;

+ 5 - 5
src/main/java/com/izouma/awesomeAdmin/service/sms/AliSmsService.java → src/main/java/com/izouma/campusTakeaway/service/sms/AliSmsService.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.service.sms;
+package com.izouma.campusTakeaway.service.sms;
 
 import com.aliyuncs.CommonRequest;
 import com.aliyuncs.CommonResponse;
@@ -7,10 +7,10 @@ import com.aliyuncs.IAcsClient;
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
-import com.izouma.awesomeAdmin.config.Constants;
-import com.izouma.awesomeAdmin.domain.SmsRecord;
-import com.izouma.awesomeAdmin.exception.BusinessException;
-import com.izouma.awesomeAdmin.repo.SmsRecordRepo;
+import com.izouma.campusTakeaway.config.Constants;
+import com.izouma.campusTakeaway.domain.SmsRecord;
+import com.izouma.campusTakeaway.exception.BusinessException;
+import com.izouma.campusTakeaway.repo.SmsRecordRepo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/service/sms/SmsService.java → src/main/java/com/izouma/campusTakeaway/service/sms/SmsService.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.service.sms;
+package com.izouma.campusTakeaway.service.sms;
 
 import java.util.function.Supplier;
 

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/service/storage/AliStorageService.java → src/main/java/com/izouma/campusTakeaway/service/storage/AliStorageService.java

@@ -1,8 +1,8 @@
-package com.izouma.awesomeAdmin.service.storage;
+package com.izouma.campusTakeaway.service.storage;
 
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.ObjectMetadata;
-import com.izouma.awesomeAdmin.exception.BusinessException;
+import com.izouma.campusTakeaway.exception.BusinessException;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/service/storage/LocalStorageService.java → src/main/java/com/izouma/campusTakeaway/service/storage/LocalStorageService.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.service.storage;
+package com.izouma.campusTakeaway.service.storage;
 
-import com.izouma.awesomeAdmin.exception.BusinessException;
+import com.izouma.campusTakeaway.exception.BusinessException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Value;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/service/storage/StorageService.java → src/main/java/com/izouma/campusTakeaway/service/storage/StorageService.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.service.storage;
+package com.izouma.campusTakeaway.service.storage;
 
 import java.io.InputStream;
 

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/utils/DateTimeUtils.java → src/main/java/com/izouma/campusTakeaway/utils/DateTimeUtils.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.campusTakeaway.utils;
 
 import java.time.Instant;
 import java.time.LocalDate;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/utils/FileUtils.java → src/main/java/com/izouma/campusTakeaway/utils/FileUtils.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.campusTakeaway.utils;
 
 import org.apache.commons.lang3.StringUtils;
 

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/utils/IPUtils.java → src/main/java/com/izouma/campusTakeaway/utils/IPUtils.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.campusTakeaway.utils;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/utils/ImageUtils.java → src/main/java/com/izouma/campusTakeaway/utils/ImageUtils.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.campusTakeaway.utils;
 
 public class ImageUtils {
 

+ 3 - 3
src/main/java/com/izouma/awesomeAdmin/utils/JpaUtils.java → src/main/java/com/izouma/campusTakeaway/utils/JpaUtils.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.campusTakeaway.utils;
 
-import com.izouma.awesomeAdmin.annotations.Searchable;
-import com.izouma.awesomeAdmin.dto.PageQuery;
+import com.izouma.campusTakeaway.annotations.Searchable;
+import com.izouma.campusTakeaway.dto.PageQuery;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.PageRequest;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/utils/JsonUtils.java → src/main/java/com/izouma/campusTakeaway/utils/JsonUtils.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.campusTakeaway.utils;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/utils/NullAwareBeanUtilsBean.java → src/main/java/com/izouma/campusTakeaway/utils/NullAwareBeanUtilsBean.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.campusTakeaway.utils;
 
 import org.apache.commons.beanutils.BeanUtilsBean;
 

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/utils/ObjUtils.java → src/main/java/com/izouma/campusTakeaway/utils/ObjUtils.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.campusTakeaway.utils;
 
 
 import org.apache.commons.beanutils.BeanUtilsBean;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/utils/PinYinUtil.java → src/main/java/com/izouma/campusTakeaway/utils/PinYinUtil.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.campusTakeaway.utils;
 
 import net.sourceforge.pinyin4j.PinyinHelper;
 import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;

+ 3 - 3
src/main/java/com/izouma/awesomeAdmin/utils/SecurityUtils.java → src/main/java/com/izouma/campusTakeaway/utils/SecurityUtils.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.campusTakeaway.utils;
 
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.security.JwtUser;
+import com.izouma.campusTakeaway.domain.User;
+import com.izouma.campusTakeaway.security.JwtUser;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/utils/SnowflakeIdWorker.java → src/main/java/com/izouma/campusTakeaway/utils/SnowflakeIdWorker.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.campusTakeaway.utils;
 
 
 /**

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/utils/ThreadTask.java → src/main/java/com/izouma/campusTakeaway/utils/ThreadTask.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.campusTakeaway.utils;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/utils/amap/DistrictsItem.java → src/main/java/com/izouma/campusTakeaway/utils/amap/DistrictsItem.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils.amap;
+package com.izouma.campusTakeaway.utils.amap;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/utils/amap/QueryDistrictResponse.java → src/main/java/com/izouma/campusTakeaway/utils/amap/QueryDistrictResponse.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils.amap;
+package com.izouma.campusTakeaway.utils.amap;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/utils/amap/Suggestion.java → src/main/java/com/izouma/campusTakeaway/utils/amap/Suggestion.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils.amap;
+package com.izouma.campusTakeaway.utils.amap;
 
 import java.util.List;
 

+ 75 - 0
src/main/java/com/izouma/campusTakeaway/utils/excel/EnumExcelConverter.java

@@ -0,0 +1,75 @@
+package com.izouma.zhirongip.utils.excel;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.izouma.zhirongip.annotations.EnumFormat;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.EnumUtils;
+import org.springframework.util.Assert;
+
+import java.util.Objects;
+
+/**
+ * @author WuKun
+ * @since 2019/10/10
+ */
+public class EnumExcelConverter implements Converter<Enum> {
+
+    @Override
+    public Class supportJavaTypeKey() {
+        return Enum.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public Enum convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+        String cellDataStr = cellData.getStringValue();
+
+        EnumFormat annotation = contentProperty.getField().getAnnotation(EnumFormat.class);
+        Class enumClazz = annotation.value();
+        String[] fromExcel = annotation.fromExcel();
+        String[] toJavaEnum = annotation.toJavaEnum();
+
+        Enum anEnum = null;
+        if (ArrayUtils.isNotEmpty(fromExcel) && ArrayUtils.isNotEmpty(toJavaEnum)) {
+            Assert.isTrue(fromExcel.length == toJavaEnum.length, "fromExcel 与 toJavaEnum 的长度必须相同");
+            for (int i = 0; i < fromExcel.length; i++) {
+                if (Objects.equals(fromExcel[i], cellDataStr)) {
+                    anEnum = EnumUtils.getEnum(enumClazz, toJavaEnum[i]);
+                }
+            }
+        } else {
+            anEnum = EnumUtils.getEnum(enumClazz, cellDataStr);
+        }
+
+        Assert.notNull(anEnum, "枚举值不合法");
+        return anEnum;
+    }
+
+    @Override
+    public CellData convertToExcelData(Enum value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+
+        String enumName = value.name();
+
+        EnumFormat annotation = contentProperty.getField().getAnnotation(EnumFormat.class);
+        String[] fromExcel = annotation.fromExcel();
+        String[] toJavaEnum = annotation.toJavaEnum();
+
+        if (ArrayUtils.isNotEmpty(fromExcel) && ArrayUtils.isNotEmpty(toJavaEnum)) {
+            Assert.isTrue(fromExcel.length == toJavaEnum.length, "fromExcel 与 toJavaEnum 的长度必须相同");
+            for (int i = 0; i < toJavaEnum.length; i++) {
+                if (Objects.equals(toJavaEnum[i], enumName)) {
+                    return new CellData(fromExcel[i]);
+                }
+            }
+        }
+        return new CellData(enumName);
+    }
+}

+ 1 - 2
src/main/java/com/izouma/awesomeAdmin/utils/excel/ExcelUtils.java → src/main/java/com/izouma/campusTakeaway/utils/excel/ExcelUtils.java

@@ -1,7 +1,6 @@
-package com.izouma.awesomeAdmin.utils.excel;
+package com.izouma.campusTakeaway.utils.excel;
 
 import com.alibaba.excel.EasyExcel;
-import com.izouma.awesomeAdmin.domain.User;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است