Browse Source

代码上传

xiao547607 5 years ago
parent
commit
c22fde6024
100 changed files with 192 additions and 206 deletions
  1. 3 3
      common/pom.xml
  2. 1 1
      common/src/main/java/com/jpsoft/campus/config/OSSConfig.java
  3. 1 1
      common/src/main/java/com/jpsoft/campus/config/ParkingConfig.java
  4. 1 2
      common/src/main/java/com/jpsoft/campus/config/TemperatureConfig.java
  5. 1 1
      common/src/main/java/com/jpsoft/campus/config/WxConfig.java
  6. 1 1
      common/src/main/java/com/jpsoft/campus/config/WxCpConfig.java
  7. 1 1
      common/src/main/java/com/jpsoft/campus/cpbuilder/AbstractBuilder.java
  8. 1 1
      common/src/main/java/com/jpsoft/campus/cpbuilder/TextBuilder.java
  9. 1 1
      common/src/main/java/com/jpsoft/campus/cphandler/AbstractHandler.java
  10. 2 2
      common/src/main/java/com/jpsoft/campus/cphandler/ContactChangeHandler.java
  11. 1 1
      common/src/main/java/com/jpsoft/campus/cphandler/EnterAgentHandler.java
  12. 2 2
      common/src/main/java/com/jpsoft/campus/cphandler/LocationHandler.java
  13. 1 1
      common/src/main/java/com/jpsoft/campus/cphandler/LogHandler.java
  14. 1 1
      common/src/main/java/com/jpsoft/campus/cphandler/MenuHandler.java
  15. 2 3
      common/src/main/java/com/jpsoft/campus/cphandler/MsgHandler.java
  16. 1 1
      common/src/main/java/com/jpsoft/campus/cphandler/NullHandler.java
  17. 1 1
      common/src/main/java/com/jpsoft/campus/cphandler/ScanHandler.java
  18. 2 2
      common/src/main/java/com/jpsoft/campus/cphandler/SubscribeHandler.java
  19. 1 1
      common/src/main/java/com/jpsoft/campus/cphandler/UnsubscribeHandler.java
  20. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/dto/MessageResult.java
  21. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/dto/Sort.java
  22. 2 2
      common/src/main/java/com/jpsoft/campus/modules/common/service/BaseService.java
  23. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/service/IRedisService.java
  24. 2 2
      common/src/main/java/com/jpsoft/campus/modules/common/service/impl/RedisServiceImpl.java
  25. 1 5
      common/src/main/java/com/jpsoft/campus/modules/common/utils/AESUtil.java
  26. 2 2
      common/src/main/java/com/jpsoft/campus/modules/common/utils/ApiUtil.java
  27. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/BASE64DecodedMultipartFile.java
  28. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/Base64.java
  29. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/CheckIdCard.java
  30. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/DES3.java
  31. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/Generator/AbstractCaptchaA.java
  32. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/Generator/AbstractGeneratorA.java
  33. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/Generator/CaptchaUtilA.java
  34. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/Generator/CircleCaptchaA.java
  35. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/Generator/RandomGeneratorA.java
  36. 1 3
      common/src/main/java/com/jpsoft/campus/modules/common/utils/HttpConnectionUtil.java
  37. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/HttpUtil.java
  38. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/MyX509TrustManager.java
  39. 2 2
      common/src/main/java/com/jpsoft/campus/modules/common/utils/OSSUtil.java
  40. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/POIUtils.java
  41. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/PojoUtils.java
  42. 2 2
      common/src/main/java/com/jpsoft/campus/modules/common/utils/SMSUtil.java
  43. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/Sign.java
  44. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/StringUtils.java
  45. 1 3
      common/src/main/java/com/jpsoft/campus/modules/common/utils/TimeZonesUtil.java
  46. 2 2
      common/src/main/java/com/jpsoft/campus/modules/common/utils/WechatMessageUtil.java
  47. 3 3
      common/src/main/java/com/jpsoft/campus/modules/common/utils/WeixinUtil.java
  48. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/enterprise/AesException.java
  49. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/enterprise/ByteGroup.java
  50. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/enterprise/PKCS7Encoder.java
  51. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/enterprise/SHA1.java
  52. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/enterprise/WXBizMsgCrypt.java
  53. 1 1
      common/src/main/java/com/jpsoft/campus/modules/common/utils/enterprise/XMLParse.java
  54. 1 1
      common/src/main/java/com/jpsoft/campus/modules/realname/dto/CorpDTO.java
  55. 1 1
      common/src/main/java/com/jpsoft/campus/modules/realname/dto/ProjectDTO.java
  56. 1 1
      common/src/main/java/com/jpsoft/campus/modules/realname/dto/ProjectWorker.java
  57. 1 1
      common/src/main/java/com/jpsoft/campus/modules/realname/dto/TeamDTO.java
  58. 1 3
      common/src/main/java/com/jpsoft/campus/modules/realname/dto/WorkerAttendanceDTO.java
  59. 1 1
      common/src/main/java/com/jpsoft/campus/modules/realname/http/RealnameSysRequest.java
  60. 3 3
      common/src/main/java/com/jpsoft/campus/modules/sys/dao/DataDictionaryDAO.java
  61. 3 3
      common/src/main/java/com/jpsoft/campus/modules/sys/dao/MenuDAO.java
  62. 3 3
      common/src/main/java/com/jpsoft/campus/modules/sys/dao/PermissionDAO.java
  63. 3 3
      common/src/main/java/com/jpsoft/campus/modules/sys/dao/RoleDAO.java
  64. 3 3
      common/src/main/java/com/jpsoft/campus/modules/sys/dao/RoleMenuDAO.java
  65. 3 3
      common/src/main/java/com/jpsoft/campus/modules/sys/dao/RolePermissionDAO.java
  66. 3 3
      common/src/main/java/com/jpsoft/campus/modules/sys/dao/SysLogDAO.java
  67. 3 3
      common/src/main/java/com/jpsoft/campus/modules/sys/dao/UserDAO.java
  68. 4 4
      common/src/main/java/com/jpsoft/campus/modules/sys/dao/UserRoleDAO.java
  69. 1 1
      common/src/main/java/com/jpsoft/campus/modules/sys/dto/RoleRelatedDTO.java
  70. 1 1
      common/src/main/java/com/jpsoft/campus/modules/sys/entity/DataDictionary.java
  71. 1 1
      common/src/main/java/com/jpsoft/campus/modules/sys/entity/Menu.java
  72. 1 1
      common/src/main/java/com/jpsoft/campus/modules/sys/entity/Permission.java
  73. 1 1
      common/src/main/java/com/jpsoft/campus/modules/sys/entity/Role.java
  74. 1 1
      common/src/main/java/com/jpsoft/campus/modules/sys/entity/RoleMenu.java
  75. 1 1
      common/src/main/java/com/jpsoft/campus/modules/sys/entity/RolePermission.java
  76. 1 1
      common/src/main/java/com/jpsoft/campus/modules/sys/entity/SysLog.java
  77. 1 2
      common/src/main/java/com/jpsoft/campus/modules/sys/entity/User.java
  78. 1 1
      common/src/main/java/com/jpsoft/campus/modules/sys/entity/UserRole.java
  79. 3 3
      common/src/main/java/com/jpsoft/campus/modules/sys/service/DataDictionaryService.java
  80. 3 3
      common/src/main/java/com/jpsoft/campus/modules/sys/service/MenuService.java
  81. 3 3
      common/src/main/java/com/jpsoft/campus/modules/sys/service/PermissionService.java
  82. 3 3
      common/src/main/java/com/jpsoft/campus/modules/sys/service/RoleMenuService.java
  83. 3 3
      common/src/main/java/com/jpsoft/campus/modules/sys/service/RolePermissionService.java
  84. 3 3
      common/src/main/java/com/jpsoft/campus/modules/sys/service/RoleService.java
  85. 3 3
      common/src/main/java/com/jpsoft/campus/modules/sys/service/SysLogService.java
  86. 4 4
      common/src/main/java/com/jpsoft/campus/modules/sys/service/UserRoleService.java
  87. 3 3
      common/src/main/java/com/jpsoft/campus/modules/sys/service/UserService.java
  88. 5 6
      common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/DataDictionaryServiceImpl.java
  89. 5 5
      common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/MenuServiceImpl.java
  90. 5 5
      common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/PermissionServiceImpl.java
  91. 5 5
      common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/RoleMenuServiceImpl.java
  92. 5 5
      common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/RolePermissionServiceImpl.java
  93. 5 5
      common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/RoleServiceImpl.java
  94. 5 5
      common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/SysLogServiceImpl.java
  95. 6 6
      common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/UserRoleServiceImpl.java
  96. 5 5
      common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/UserServiceImpl.java
  97. 2 2
      common/src/main/java/com/jpsoft/campus/modules/wechat/dao/AccessContorlDAO.java
  98. 3 3
      common/src/main/java/com/jpsoft/campus/modules/wechat/dao/ReplyMessageDAO.java
  99. 1 1
      common/src/main/java/com/jpsoft/campus/modules/wechat/entity/AccessControl.java
  100. 1 1
      common/src/main/java/com/jpsoft/campus/modules/wechat/entity/AccessToken.java

+ 3 - 3
common/pom.xml

@@ -3,14 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>smart-community-server</artifactId>
-        <groupId>com.jpsoft.smart</groupId>
+        <artifactId>campus-admission-server</artifactId>
+        <groupId>com.jpsoft.campus</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>common</artifactId>
     <name>common</name>
-    <description>智慧小区公共库</description>
+    <description>开发区网上入学系统公共库</description>
     <packaging>jar</packaging>
     <properties>
         <swagger2.version>2.7.0</swagger2.version>

+ 1 - 1
common/src/main/java/com/jpsoft/smart/config/OSSConfig.java → common/src/main/java/com/jpsoft/campus/config/OSSConfig.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.config;
+package com.jpsoft.campus.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/config/ParkingConfig.java → common/src/main/java/com/jpsoft/campus/config/ParkingConfig.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.config;
+package com.jpsoft.campus.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 1 - 2
common/src/main/java/com/jpsoft/smart/config/TemperatureConfig.java → common/src/main/java/com/jpsoft/campus/config/TemperatureConfig.java

@@ -1,7 +1,6 @@
-package com.jpsoft.smart.config;
+package com.jpsoft.campus.config;
 
 import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 @Component

+ 1 - 1
common/src/main/java/com/jpsoft/smart/config/WxConfig.java → common/src/main/java/com/jpsoft/campus/config/WxConfig.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.config;
+package com.jpsoft.campus.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/config/WxCpConfig.java → common/src/main/java/com/jpsoft/campus/config/WxCpConfig.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.config;
+package com.jpsoft.campus.config;
 
 import lombok.Data;
 import lombok.Getter;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/cpbuilder/AbstractBuilder.java → common/src/main/java/com/jpsoft/campus/cpbuilder/AbstractBuilder.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.cpbuilder;
+package com.jpsoft.campus.cpbuilder;
 
 import me.chanjar.weixin.cp.api.WxCpService;
 import me.chanjar.weixin.cp.bean.WxCpXmlMessage;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/cpbuilder/TextBuilder.java → common/src/main/java/com/jpsoft/campus/cpbuilder/TextBuilder.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.cpbuilder;
+package com.jpsoft.campus.cpbuilder;
 
 import me.chanjar.weixin.cp.api.WxCpService;
 import me.chanjar.weixin.cp.bean.WxCpXmlMessage;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/cphandler/AbstractHandler.java → common/src/main/java/com/jpsoft/campus/cphandler/AbstractHandler.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.cphandler;
+package com.jpsoft.campus.cphandler;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 2 - 2
common/src/main/java/com/jpsoft/smart/cphandler/ContactChangeHandler.java → common/src/main/java/com/jpsoft/campus/cphandler/ContactChangeHandler.java

@@ -1,8 +1,8 @@
-package com.jpsoft.smart.cphandler;
+package com.jpsoft.campus.cphandler;
 
 import java.util.Map;
 
-import com.jpsoft.smart.cpbuilder.TextBuilder;
+import com.jpsoft.campus.cpbuilder.TextBuilder;
 import org.springframework.stereotype.Component;
 
 import me.chanjar.weixin.common.session.WxSessionManager;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/cphandler/EnterAgentHandler.java → common/src/main/java/com/jpsoft/campus/cphandler/EnterAgentHandler.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.cphandler;
+package com.jpsoft.campus.cphandler;
 
 import java.util.Map;
 

+ 2 - 2
common/src/main/java/com/jpsoft/smart/cphandler/LocationHandler.java → common/src/main/java/com/jpsoft/campus/cphandler/LocationHandler.java

@@ -1,8 +1,8 @@
-package com.jpsoft.smart.cphandler;
+package com.jpsoft.campus.cphandler;
 
 import java.util.Map;
 
-import com.jpsoft.smart.cpbuilder.TextBuilder;
+import com.jpsoft.campus.cpbuilder.TextBuilder;
 import org.springframework.stereotype.Component;
 
 import me.chanjar.weixin.common.api.WxConsts;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/cphandler/LogHandler.java → common/src/main/java/com/jpsoft/campus/cphandler/LogHandler.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.cphandler;
+package com.jpsoft.campus.cphandler;
 
 import java.util.Map;
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/cphandler/MenuHandler.java → common/src/main/java/com/jpsoft/campus/cphandler/MenuHandler.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.cphandler;
+package com.jpsoft.campus.cphandler;
 
 import java.util.Map;
 

+ 2 - 3
common/src/main/java/com/jpsoft/smart/cphandler/MsgHandler.java → common/src/main/java/com/jpsoft/campus/cphandler/MsgHandler.java

@@ -1,7 +1,6 @@
-package com.jpsoft.smart.cphandler;
+package com.jpsoft.campus.cphandler;
 
-import cn.hutool.json.JSONObject;
-import com.jpsoft.smart.cpbuilder.TextBuilder;
+import com.jpsoft.campus.cpbuilder.TextBuilder;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.cp.api.WxCpService;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/cphandler/NullHandler.java → common/src/main/java/com/jpsoft/campus/cphandler/NullHandler.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.cphandler;
+package com.jpsoft.campus.cphandler;
 
 import java.util.Map;
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/cphandler/ScanHandler.java → common/src/main/java/com/jpsoft/campus/cphandler/ScanHandler.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.cphandler;
+package com.jpsoft.campus.cphandler;
 
 /**
  * @author Binary Wang(https://github.com/binarywang)

+ 2 - 2
common/src/main/java/com/jpsoft/smart/cphandler/SubscribeHandler.java → common/src/main/java/com/jpsoft/campus/cphandler/SubscribeHandler.java

@@ -1,8 +1,8 @@
-package com.jpsoft.smart.cphandler;
+package com.jpsoft.campus.cphandler;
 
 import java.util.Map;
 
-import com.jpsoft.smart.cpbuilder.TextBuilder;
+import com.jpsoft.campus.cpbuilder.TextBuilder;
 import org.springframework.stereotype.Component;
 
 import me.chanjar.weixin.common.error.WxErrorException;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/cphandler/UnsubscribeHandler.java → common/src/main/java/com/jpsoft/campus/cphandler/UnsubscribeHandler.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.cphandler;
+package com.jpsoft.campus.cphandler;
 
 import java.util.Map;
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/dto/MessageResult.java → common/src/main/java/com/jpsoft/campus/modules/common/dto/MessageResult.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.dto;
+package com.jpsoft.campus.modules.common.dto;
 
 public class MessageResult<T> {
 	private boolean result;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/dto/Sort.java → common/src/main/java/com/jpsoft/campus/modules/common/dto/Sort.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.dto;
+package com.jpsoft.campus.modules.common.dto;
 
 import java.io.Serializable;
 

+ 2 - 2
common/src/main/java/com/jpsoft/smart/modules/common/service/BaseService.java → common/src/main/java/com/jpsoft/campus/modules/common/service/BaseService.java

@@ -1,7 +1,7 @@
-package com.jpsoft.smart.modules.common.service;
+package com.jpsoft.campus.modules.common.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 import java.util.List;
 import java.util.Map;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/service/IRedisService.java → common/src/main/java/com/jpsoft/campus/modules/common/service/IRedisService.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.service;
+package com.jpsoft.campus.modules.common.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.HashOperations;

+ 2 - 2
common/src/main/java/com/jpsoft/smart/modules/common/service/impl/RedisServiceImpl.java → common/src/main/java/com/jpsoft/campus/modules/common/service/impl/RedisServiceImpl.java

@@ -1,6 +1,6 @@
-package com.jpsoft.smart.modules.common.service.impl;
+package com.jpsoft.campus.modules.common.service.impl;
 
-import com.jpsoft.smart.modules.common.service.IRedisService;
+import com.jpsoft.campus.modules.common.service.IRedisService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 

+ 1 - 5
common/src/main/java/com/jpsoft/smart/modules/common/utils/AESUtil.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/AESUtil.java

@@ -1,16 +1,12 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
 import java.io.UnsupportedEncodingException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
 import java.security.Security;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 

+ 2 - 2
common/src/main/java/com/jpsoft/smart/modules/common/utils/ApiUtil.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/ApiUtil.java

@@ -1,8 +1,8 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONObject;
-import com.jpsoft.smart.modules.common.service.impl.RedisServiceImpl;
+import com.jpsoft.campus.modules.common.service.impl.RedisServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/BASE64DecodedMultipartFile.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/BASE64DecodedMultipartFile.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
 import org.springframework.web.multipart.MultipartFile;
 import sun.misc.BASE64Decoder;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/Base64.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/Base64.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
 public final class Base64 {
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/CheckIdCard.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/CheckIdCard.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/DES3.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/DES3.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKeyFactory;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/Generator/AbstractCaptchaA.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/Generator/AbstractCaptchaA.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils.Generator;
+package com.jpsoft.campus.modules.common.utils.Generator;
 
 import cn.hutool.captcha.ICaptcha;
 import cn.hutool.captcha.generator.CodeGenerator;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/Generator/AbstractGeneratorA.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/Generator/AbstractGeneratorA.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils.Generator;
+package com.jpsoft.campus.modules.common.utils.Generator;
 
 import cn.hutool.captcha.generator.CodeGenerator;
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/Generator/CaptchaUtilA.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/Generator/CaptchaUtilA.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils.Generator;
+package com.jpsoft.campus.modules.common.utils.Generator;
 
 import cn.hutool.captcha.CircleCaptcha;
 import cn.hutool.captcha.LineCaptcha;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/Generator/CircleCaptchaA.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/Generator/CircleCaptchaA.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils.Generator;
+package com.jpsoft.campus.modules.common.utils.Generator;
 
 import cn.hutool.core.img.GraphicsUtil;
 import cn.hutool.core.img.ImgUtil;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/Generator/RandomGeneratorA.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/Generator/RandomGeneratorA.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils.Generator;
+package com.jpsoft.campus.modules.common.utils.Generator;
 
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;

+ 1 - 3
common/src/main/java/com/jpsoft/smart/modules/common/utils/HttpConnectionUtil.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/HttpConnectionUtil.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
 import net.sf.json.JSONObject;
 import org.apache.http.HttpEntity;
@@ -12,8 +12,6 @@ import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.AbstractHttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.conn.BasicHttpClientConnectionManager;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/HttpUtil.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/HttpUtil.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
 import lombok.extern.slf4j.Slf4j;
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/MyX509TrustManager.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/MyX509TrustManager.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
 import javax.net.ssl.X509TrustManager;
 import java.security.cert.CertificateException;

+ 2 - 2
common/src/main/java/com/jpsoft/smart/modules/common/utils/OSSUtil.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/OSSUtil.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
 import cn.hutool.core.codec.Base64Encoder;
 import cn.hutool.core.date.DateTime;
@@ -8,7 +8,7 @@ import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.GeneratePresignedUrlRequest;
 import com.aliyun.oss.model.OSSObject;
 import com.aliyun.oss.model.PutObjectResult;
-import com.jpsoft.smart.config.OSSConfig;
+import com.jpsoft.campus.config.OSSConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/POIUtils.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/POIUtils.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.converter.ExcelToHtmlConverter;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/PojoUtils.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/PojoUtils.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
 import com.github.dozermapper.core.DozerBeanMapperBuilder;
 import com.github.dozermapper.core.Mapper;

+ 2 - 2
common/src/main/java/com/jpsoft/smart/modules/common/utils/SMSUtil.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/SMSUtil.java

@@ -1,6 +1,6 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
-import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.campus.modules.common.dto.MessageResult;
 import com.taobao.api.ApiException;
 import com.taobao.api.DefaultTaobaoClient;
 import com.taobao.api.TaobaoClient;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/Sign.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/Sign.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/StringUtils.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/StringUtils.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;

+ 1 - 3
common/src/main/java/com/jpsoft/smart/modules/common/utils/TimeZonesUtil.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/TimeZonesUtil.java

@@ -1,6 +1,4 @@
-package com.jpsoft.smart.modules.common.utils;
-
-import java.math.BigDecimal;
+package com.jpsoft.campus.modules.common.utils;
 
 /**
  * @author 墨鱼_mo

+ 2 - 2
common/src/main/java/com/jpsoft/smart/modules/common/utils/WechatMessageUtil.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/WechatMessageUtil.java

@@ -1,7 +1,7 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
 import cn.hutool.core.date.DateUtil;
-import com.jpsoft.smart.modules.wechat.entity.AccessToken;
+import com.jpsoft.campus.modules.wechat.entity.AccessToken;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/common/utils/WeixinUtil.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/WeixinUtil.java

@@ -1,8 +1,8 @@
-package com.jpsoft.smart.modules.common.utils;
+package com.jpsoft.campus.modules.common.utils;
 
 import cn.hutool.core.date.DateTime;
-import com.jpsoft.smart.modules.wechat.entity.AccessToken;
-import com.jpsoft.smart.modules.wechat.vo.UserInfo;
+import com.jpsoft.campus.modules.wechat.entity.AccessToken;
+import com.jpsoft.campus.modules.wechat.vo.UserInfo;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONException;
 import net.sf.json.JSONObject;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/enterprise/AesException.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/enterprise/AesException.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils.enterprise;
+package com.jpsoft.campus.modules.common.utils.enterprise;
 
 /**
  * @author 墨鱼_mo

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/enterprise/ByteGroup.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/enterprise/ByteGroup.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils.enterprise;
+package com.jpsoft.campus.modules.common.utils.enterprise;
 
 import java.util.ArrayList;
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/enterprise/PKCS7Encoder.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/enterprise/PKCS7Encoder.java

@@ -6,7 +6,7 @@
 
 // ------------------------------------------------------------------------
 
-package com.jpsoft.smart.modules.common.utils.enterprise;
+package com.jpsoft.campus.modules.common.utils.enterprise;
 
 import java.nio.charset.Charset;
 import java.util.Arrays;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/enterprise/SHA1.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/enterprise/SHA1.java

@@ -6,7 +6,7 @@
 
 // ------------------------------------------------------------------------
 
-package com.jpsoft.smart.modules.common.utils.enterprise;
+package com.jpsoft.campus.modules.common.utils.enterprise;
 
 import java.security.MessageDigest;
 import java.util.Arrays;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/enterprise/WXBizMsgCrypt.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/enterprise/WXBizMsgCrypt.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.common.utils.enterprise; /**
+package com.jpsoft.campus.modules.common.utils.enterprise; /**
  * 对公众平台发送给公众账号的消息加解密示例代码.
  *
  * @copyright Copyright (c) 1998-2014 Tencent Inc.

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/common/utils/enterprise/XMLParse.java → common/src/main/java/com/jpsoft/campus/modules/common/utils/enterprise/XMLParse.java

@@ -6,7 +6,7 @@
 
 // ------------------------------------------------------------------------
 
-package com.jpsoft.smart.modules.common.utils.enterprise;
+package com.jpsoft.campus.modules.common.utils.enterprise;
 
 import java.io.StringReader;
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/realname/dto/CorpDTO.java → common/src/main/java/com/jpsoft/campus/modules/realname/dto/CorpDTO.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.realname.dto;
+package com.jpsoft.campus.modules.realname.dto;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/realname/dto/ProjectDTO.java → common/src/main/java/com/jpsoft/campus/modules/realname/dto/ProjectDTO.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.realname.dto;
+package com.jpsoft.campus.modules.realname.dto;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/realname/dto/ProjectWorker.java → common/src/main/java/com/jpsoft/campus/modules/realname/dto/ProjectWorker.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.realname.dto;
+package com.jpsoft.campus.modules.realname.dto;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/realname/dto/TeamDTO.java → common/src/main/java/com/jpsoft/campus/modules/realname/dto/TeamDTO.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.realname.dto;
+package com.jpsoft.campus.modules.realname.dto;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;

+ 1 - 3
common/src/main/java/com/jpsoft/smart/modules/realname/dto/WorkerAttendanceDTO.java → common/src/main/java/com/jpsoft/campus/modules/realname/dto/WorkerAttendanceDTO.java

@@ -1,10 +1,8 @@
-package com.jpsoft.smart.modules.realname.dto;
+package com.jpsoft.campus.modules.realname.dto;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.jpsoft.smart.modules.base.entity.ProjectInfo;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.codehaus.jackson.annotate.JsonIgnore;
 
 import java.io.Serializable;
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/realname/http/RealnameSysRequest.java → common/src/main/java/com/jpsoft/campus/modules/realname/http/RealnameSysRequest.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.realname.http;
+package com.jpsoft.campus.modules.realname.http;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/sys/dao/DataDictionaryDAO.java → common/src/main/java/com/jpsoft/campus/modules/sys/dao/DataDictionaryDAO.java

@@ -1,7 +1,7 @@
-package com.jpsoft.smart.modules.sys.dao;
+package com.jpsoft.campus.modules.sys.dao;
 
-import com.jpsoft.smart.modules.common.dto.Sort;
-import com.jpsoft.smart.modules.sys.entity.DataDictionary;
+import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.sys.entity.DataDictionary;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/sys/dao/MenuDAO.java → common/src/main/java/com/jpsoft/campus/modules/sys/dao/MenuDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.smart.modules.sys.dao;
+package com.jpsoft.campus.modules.sys.dao;
 
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.smart.modules.sys.entity.Menu;
+import com.jpsoft.campus.modules.sys.entity.Menu;
 import java.util.Map;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 @Repository
 public interface MenuDAO {

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/sys/dao/PermissionDAO.java → common/src/main/java/com/jpsoft/campus/modules/sys/dao/PermissionDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.smart.modules.sys.dao;
+package com.jpsoft.campus.modules.sys.dao;
 
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.smart.modules.sys.entity.Permission;
+import com.jpsoft.campus.modules.sys.entity.Permission;
 import java.util.Map;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 @Repository
 public interface PermissionDAO {

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/sys/dao/RoleDAO.java → common/src/main/java/com/jpsoft/campus/modules/sys/dao/RoleDAO.java

@@ -1,10 +1,10 @@
-package com.jpsoft.smart.modules.sys.dao;
+package com.jpsoft.campus.modules.sys.dao;
 
 import java.util.List;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.smart.modules.sys.entity.Role;
+import com.jpsoft.campus.modules.sys.entity.Role;
 import java.util.Map;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 @Repository
 public interface RoleDAO {

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/sys/dao/RoleMenuDAO.java → common/src/main/java/com/jpsoft/campus/modules/sys/dao/RoleMenuDAO.java

@@ -1,10 +1,10 @@
-package com.jpsoft.smart.modules.sys.dao;
+package com.jpsoft.campus.modules.sys.dao;
 
 import java.util.List;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.smart.modules.sys.entity.RoleMenu;
+import com.jpsoft.campus.modules.sys.entity.RoleMenu;
 import java.util.Map;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 @Repository
 public interface RoleMenuDAO {

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/sys/dao/RolePermissionDAO.java → common/src/main/java/com/jpsoft/campus/modules/sys/dao/RolePermissionDAO.java

@@ -1,10 +1,10 @@
-package com.jpsoft.smart.modules.sys.dao;
+package com.jpsoft.campus.modules.sys.dao;
 
 import java.util.List;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.smart.modules.sys.entity.RolePermission;
+import com.jpsoft.campus.modules.sys.entity.RolePermission;
 import java.util.Map;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 @Repository
 public interface RolePermissionDAO {

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/sys/dao/SysLogDAO.java → common/src/main/java/com/jpsoft/campus/modules/sys/dao/SysLogDAO.java

@@ -1,7 +1,7 @@
-package com.jpsoft.smart.modules.sys.dao;
+package com.jpsoft.campus.modules.sys.dao;
 
-import com.jpsoft.smart.modules.common.dto.Sort;
-import com.jpsoft.smart.modules.sys.entity.SysLog;
+import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.sys.entity.SysLog;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/sys/dao/UserDAO.java → common/src/main/java/com/jpsoft/campus/modules/sys/dao/UserDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.smart.modules.sys.dao;
+package com.jpsoft.campus.modules.sys.dao;
 
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.smart.modules.sys.entity.User;
+import com.jpsoft.campus.modules.sys.entity.User;
 import java.util.Map;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 @Repository
 public interface UserDAO {

+ 4 - 4
common/src/main/java/com/jpsoft/smart/modules/sys/dao/UserRoleDAO.java → common/src/main/java/com/jpsoft/campus/modules/sys/dao/UserRoleDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.smart.modules.sys.dao;
+package com.jpsoft.campus.modules.sys.dao;
 
 import java.util.List;
 
-import com.jpsoft.smart.modules.sys.entity.Role;
+import com.jpsoft.campus.modules.sys.entity.Role;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.smart.modules.sys.entity.UserRole;
+import com.jpsoft.campus.modules.sys.entity.UserRole;
 import java.util.Map;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 @Repository
 public interface UserRoleDAO {

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/sys/dto/RoleRelatedDTO.java → common/src/main/java/com/jpsoft/campus/modules/sys/dto/RoleRelatedDTO.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.sys.dto;
+package com.jpsoft.campus.modules.sys.dto;
 
 import java.util.List;
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/sys/entity/DataDictionary.java → common/src/main/java/com/jpsoft/campus/modules/sys/entity/DataDictionary.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.sys.entity;
+package com.jpsoft.campus.modules.sys.entity;
 
 import java.util.Date;
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/sys/entity/Menu.java → common/src/main/java/com/jpsoft/campus/modules/sys/entity/Menu.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.sys.entity;
+package com.jpsoft.campus.modules.sys.entity;
 
 import java.util.Date;
 import java.util.List;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/sys/entity/Permission.java → common/src/main/java/com/jpsoft/campus/modules/sys/entity/Permission.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.sys.entity;
+package com.jpsoft.campus.modules.sys.entity;
 
 import java.util.Date;
 import org.springframework.format.annotation.DateTimeFormat;

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/sys/entity/Role.java → common/src/main/java/com/jpsoft/campus/modules/sys/entity/Role.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.sys.entity;
+package com.jpsoft.campus.modules.sys.entity;
 
 import java.util.Date;
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/sys/entity/RoleMenu.java → common/src/main/java/com/jpsoft/campus/modules/sys/entity/RoleMenu.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.sys.entity;
+package com.jpsoft.campus.modules.sys.entity;
 
 import java.util.Date;
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/sys/entity/RolePermission.java → common/src/main/java/com/jpsoft/campus/modules/sys/entity/RolePermission.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.sys.entity;
+package com.jpsoft.campus.modules.sys.entity;
 
 import java.util.Date;
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/sys/entity/SysLog.java → common/src/main/java/com/jpsoft/campus/modules/sys/entity/SysLog.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.sys.entity;
+package com.jpsoft.campus.modules.sys.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

+ 1 - 2
common/src/main/java/com/jpsoft/smart/modules/sys/entity/User.java → common/src/main/java/com/jpsoft/campus/modules/sys/entity/User.java

@@ -1,9 +1,8 @@
-package com.jpsoft.smart.modules.sys.entity;
+package com.jpsoft.campus.modules.sys.entity;
 
 import java.util.Date;
 import java.util.List;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/sys/entity/UserRole.java → common/src/main/java/com/jpsoft/campus/modules/sys/entity/UserRole.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.sys.entity;
+package com.jpsoft.campus.modules.sys.entity;
 
 import java.util.Date;
 

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/sys/service/DataDictionaryService.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/DataDictionaryService.java

@@ -1,8 +1,8 @@
-package com.jpsoft.smart.modules.sys.service;
+package com.jpsoft.campus.modules.sys.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.sys.entity.DataDictionary;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.sys.entity.DataDictionary;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 import java.util.List;
 import java.util.Map;

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/sys/service/MenuService.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/MenuService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.smart.modules.sys.service;
+package com.jpsoft.campus.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.smart.modules.sys.entity.Menu;
+import com.jpsoft.campus.modules.sys.entity.Menu;
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 public interface MenuService {
 	Menu get(String id);

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/sys/service/PermissionService.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/PermissionService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.smart.modules.sys.service;
+package com.jpsoft.campus.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.smart.modules.sys.entity.Permission;
+import com.jpsoft.campus.modules.sys.entity.Permission;
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 public interface PermissionService {
 	Permission get(String id);

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/sys/service/RoleMenuService.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/RoleMenuService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.smart.modules.sys.service;
+package com.jpsoft.campus.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.smart.modules.sys.entity.RoleMenu;
+import com.jpsoft.campus.modules.sys.entity.RoleMenu;
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 public interface RoleMenuService {
 	RoleMenu get(String id);

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/sys/service/RolePermissionService.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/RolePermissionService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.smart.modules.sys.service;
+package com.jpsoft.campus.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.smart.modules.sys.entity.RolePermission;
+import com.jpsoft.campus.modules.sys.entity.RolePermission;
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 public interface RolePermissionService {
 	RolePermission get(String id);

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/sys/service/RoleService.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/RoleService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.smart.modules.sys.service;
+package com.jpsoft.campus.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.smart.modules.sys.entity.Role;
+import com.jpsoft.campus.modules.sys.entity.Role;
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 public interface RoleService {
 	Role get(String id);

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/sys/service/SysLogService.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/SysLogService.java

@@ -1,8 +1,8 @@
-package com.jpsoft.smart.modules.sys.service;
+package com.jpsoft.campus.modules.sys.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
-import com.jpsoft.smart.modules.sys.entity.SysLog;
+import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.sys.entity.SysLog;
 
 import java.util.List;
 import java.util.Map;

+ 4 - 4
common/src/main/java/com/jpsoft/smart/modules/sys/service/UserRoleService.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/UserRoleService.java

@@ -1,12 +1,12 @@
-package com.jpsoft.smart.modules.sys.service;
+package com.jpsoft.campus.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
 
-import com.jpsoft.smart.modules.sys.entity.Role;
-import com.jpsoft.smart.modules.sys.entity.UserRole;
+import com.jpsoft.campus.modules.sys.entity.Role;
+import com.jpsoft.campus.modules.sys.entity.UserRole;
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 public interface UserRoleService {
 	UserRole get(String id);

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/sys/service/UserService.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/UserService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.smart.modules.sys.service;
+package com.jpsoft.campus.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.smart.modules.sys.entity.User;
+import com.jpsoft.campus.modules.sys.entity.User;
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 public interface UserService {
 	User get(String id);

+ 5 - 6
common/src/main/java/com/jpsoft/smart/modules/sys/service/impl/DataDictionaryServiceImpl.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/DataDictionaryServiceImpl.java

@@ -1,16 +1,15 @@
-package com.jpsoft.smart.modules.sys.service.impl;
+package com.jpsoft.campus.modules.sys.service.impl;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.jpsoft.smart.modules.common.dto.Sort;
-import com.jpsoft.smart.modules.sys.dao.DataDictionaryDAO;
-import com.jpsoft.smart.modules.sys.entity.DataDictionary;
-import com.jpsoft.smart.modules.sys.service.DataDictionaryService;
+import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.sys.dao.DataDictionaryDAO;
+import com.jpsoft.campus.modules.sys.entity.DataDictionary;
+import com.jpsoft.campus.modules.sys.service.DataDictionaryService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

+ 5 - 5
common/src/main/java/com/jpsoft/smart/modules/sys/service/impl/MenuServiceImpl.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/MenuServiceImpl.java

@@ -1,15 +1,15 @@
-package com.jpsoft.smart.modules.sys.service.impl;
+package com.jpsoft.campus.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.smart.modules.sys.dao.MenuDAO;
-import com.jpsoft.smart.modules.sys.entity.Menu;
-import com.jpsoft.smart.modules.sys.service.MenuService;
+import com.jpsoft.campus.modules.sys.dao.MenuDAO;
+import com.jpsoft.campus.modules.sys.entity.Menu;
+import com.jpsoft.campus.modules.sys.service.MenuService;
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

+ 5 - 5
common/src/main/java/com/jpsoft/smart/modules/sys/service/impl/PermissionServiceImpl.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/PermissionServiceImpl.java

@@ -1,15 +1,15 @@
-package com.jpsoft.smart.modules.sys.service.impl;
+package com.jpsoft.campus.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.smart.modules.sys.dao.PermissionDAO;
-import com.jpsoft.smart.modules.sys.entity.Permission;
-import com.jpsoft.smart.modules.sys.service.PermissionService;
+import com.jpsoft.campus.modules.sys.dao.PermissionDAO;
+import com.jpsoft.campus.modules.sys.entity.Permission;
+import com.jpsoft.campus.modules.sys.service.PermissionService;
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

+ 5 - 5
common/src/main/java/com/jpsoft/smart/modules/sys/service/impl/RoleMenuServiceImpl.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/RoleMenuServiceImpl.java

@@ -1,15 +1,15 @@
-package com.jpsoft.smart.modules.sys.service.impl;
+package com.jpsoft.campus.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.smart.modules.sys.dao.RoleMenuDAO;
-import com.jpsoft.smart.modules.sys.entity.RoleMenu;
-import com.jpsoft.smart.modules.sys.service.RoleMenuService;
+import com.jpsoft.campus.modules.sys.dao.RoleMenuDAO;
+import com.jpsoft.campus.modules.sys.entity.RoleMenu;
+import com.jpsoft.campus.modules.sys.service.RoleMenuService;
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

+ 5 - 5
common/src/main/java/com/jpsoft/smart/modules/sys/service/impl/RolePermissionServiceImpl.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/RolePermissionServiceImpl.java

@@ -1,15 +1,15 @@
-package com.jpsoft.smart.modules.sys.service.impl;
+package com.jpsoft.campus.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.smart.modules.sys.dao.RolePermissionDAO;
-import com.jpsoft.smart.modules.sys.entity.RolePermission;
-import com.jpsoft.smart.modules.sys.service.RolePermissionService;
+import com.jpsoft.campus.modules.sys.dao.RolePermissionDAO;
+import com.jpsoft.campus.modules.sys.entity.RolePermission;
+import com.jpsoft.campus.modules.sys.service.RolePermissionService;
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

+ 5 - 5
common/src/main/java/com/jpsoft/smart/modules/sys/service/impl/RoleServiceImpl.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/RoleServiceImpl.java

@@ -1,15 +1,15 @@
-package com.jpsoft.smart.modules.sys.service.impl;
+package com.jpsoft.campus.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.smart.modules.sys.dao.RoleDAO;
-import com.jpsoft.smart.modules.sys.entity.Role;
-import com.jpsoft.smart.modules.sys.service.RoleService;
+import com.jpsoft.campus.modules.sys.dao.RoleDAO;
+import com.jpsoft.campus.modules.sys.entity.Role;
+import com.jpsoft.campus.modules.sys.service.RoleService;
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

+ 5 - 5
common/src/main/java/com/jpsoft/smart/modules/sys/service/impl/SysLogServiceImpl.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/SysLogServiceImpl.java

@@ -1,11 +1,11 @@
-package com.jpsoft.smart.modules.sys.service.impl;
+package com.jpsoft.campus.modules.sys.service.impl;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.jpsoft.smart.modules.common.dto.Sort;
-import com.jpsoft.smart.modules.sys.dao.SysLogDAO;
-import com.jpsoft.smart.modules.sys.entity.SysLog;
-import com.jpsoft.smart.modules.sys.service.SysLogService;
+import com.jpsoft.campus.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.sys.dao.SysLogDAO;
+import com.jpsoft.campus.modules.sys.entity.SysLog;
+import com.jpsoft.campus.modules.sys.service.SysLogService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 

+ 6 - 6
common/src/main/java/com/jpsoft/smart/modules/sys/service/impl/UserRoleServiceImpl.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/UserRoleServiceImpl.java

@@ -1,17 +1,17 @@
-package com.jpsoft.smart.modules.sys.service.impl;
+package com.jpsoft.campus.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
 
-import com.jpsoft.smart.modules.sys.entity.Role;
+import com.jpsoft.campus.modules.sys.entity.Role;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.smart.modules.sys.dao.UserRoleDAO;
-import com.jpsoft.smart.modules.sys.entity.UserRole;
-import com.jpsoft.smart.modules.sys.service.UserRoleService;
+import com.jpsoft.campus.modules.sys.dao.UserRoleDAO;
+import com.jpsoft.campus.modules.sys.entity.UserRole;
+import com.jpsoft.campus.modules.sys.service.UserRoleService;
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

+ 5 - 5
common/src/main/java/com/jpsoft/smart/modules/sys/service/impl/UserServiceImpl.java → common/src/main/java/com/jpsoft/campus/modules/sys/service/impl/UserServiceImpl.java

@@ -1,15 +1,15 @@
-package com.jpsoft.smart.modules.sys.service.impl;
+package com.jpsoft.campus.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.smart.modules.sys.dao.UserDAO;
-import com.jpsoft.smart.modules.sys.entity.User;
-import com.jpsoft.smart.modules.sys.service.UserService;
+import com.jpsoft.campus.modules.sys.dao.UserDAO;
+import com.jpsoft.campus.modules.sys.entity.User;
+import com.jpsoft.campus.modules.sys.service.UserService;
 import com.github.pagehelper.Page;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

+ 2 - 2
common/src/main/java/com/jpsoft/smart/modules/wechat/dao/AccessContorlDAO.java → common/src/main/java/com/jpsoft/campus/modules/wechat/dao/AccessContorlDAO.java

@@ -1,6 +1,6 @@
-package com.jpsoft.smart.modules.wechat.dao;
+package com.jpsoft.campus.modules.wechat.dao;
 
-import com.jpsoft.smart.modules.wechat.entity.AccessControl;
+import com.jpsoft.campus.modules.wechat.entity.AccessControl;
 import org.springframework.stereotype.Repository;
 
 /**

+ 3 - 3
common/src/main/java/com/jpsoft/smart/modules/wechat/dao/ReplyMessageDAO.java → common/src/main/java/com/jpsoft/campus/modules/wechat/dao/ReplyMessageDAO.java

@@ -1,11 +1,11 @@
-package com.jpsoft.smart.modules.wechat.dao;
+package com.jpsoft.campus.modules.wechat.dao;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.smart.modules.wechat.entity.ReplyMessage;
+import com.jpsoft.campus.modules.wechat.entity.ReplyMessage;
 import java.util.Map;
-import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.campus.modules.common.dto.Sort;
 
 @Repository
 public interface ReplyMessageDAO {

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/wechat/entity/AccessControl.java → common/src/main/java/com/jpsoft/campus/modules/wechat/entity/AccessControl.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.wechat.entity;
+package com.jpsoft.campus.modules.wechat.entity;
 
 import lombok.Data;
 

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/wechat/entity/AccessToken.java → common/src/main/java/com/jpsoft/campus/modules/wechat/entity/AccessToken.java

@@ -1,4 +1,4 @@
-package com.jpsoft.smart.modules.wechat.entity;
+package com.jpsoft.campus.modules.wechat.entity;
 
 import lombok.Data;
 

Some files were not shown because too many files changed in this diff