合并两个包

src/main/java/com/skyversation/xjcy/Timer.java

@@ -6,7 +6,7 @@ import com.skyversation.xjcy.computer.EnterpriseHealthComputer;
 import com.skyversation.xjcy.dms.DMSColumn;
 import com.skyversation.xjcy.dms.DMSQuery;
 import com.skyversation.xjcy.dms.DMSService;
-import com.skyversation.xjcy.oauth.AuthService;
+import com.skyversation.xjcy.service.AuthService;
 import com.skyversation.xjcy.service.InvestmentPreCountService;
 import com.skyversation.xjcy.service.MessageService;
 import com.skyversation.xjcy.service.ParkPreCountService;
@@ -17,9 +17,7 @@ import javax.annotation.PostConstruct;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.MonthDay;
-import java.time.temporal.TemporalField;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

src/main/java/com/skyversation/xjcy/config/ServiceConfiguration.java

@@ -1,7 +1,7 @@
 package com.skyversation.xjcy.config;
 
 import com.skyversation.xjcy.service.WeChatService;
-import com.skyversation.xjcy.service.WxAuthServiceMock;
+import com.skyversation.xjcy.service.WxServiceMock;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -20,6 +20,6 @@ public class ServiceConfiguration {
     @Bean
     @ConditionalOnProperty(name = "app.wechat.enabled", havingValue = "false", matchIfMissing = true)
     public WeChatService noopWechatService() {
-        return new WxAuthServiceMock();
+        return new WxServiceMock();
     }
 }

src/main/java/com/skyversation/xjcy/controller/CountController.java

@@ -1,6 +1,6 @@
 package com.skyversation.xjcy.controller;
 
-import com.skyversation.xjcy.oauth.AuthService;
+import com.skyversation.xjcy.service.AuthService;
 import com.skyversation.xjcy.service.DataCountService;
 import com.skyversation.xjcy.service.InvestmentPreCountService;
 import com.skyversation.xjcy.service.ParkPreCountService;

src/main/java/com/skyversation/xjcy/controller/LoginController.java

@@ -1,7 +1,7 @@
 package com.skyversation.xjcy.controller;
 
 
-import com.skyversation.xjcy.oauth.AuthService;
+import com.skyversation.xjcy.service.AuthService;
 import com.skyversation.xjcy.util.MessageManage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;

src/main/java/com/skyversation/xjcy/controller/UploadController.java

@@ -5,7 +5,7 @@ import com.skyversation.xjcy.dms.DMSColumn;
 import com.skyversation.xjcy.dms.DMSService;
 import com.skyversation.xjcy.dms.FileType;
 import com.skyversation.xjcy.enums.WechatSource;
-import com.skyversation.xjcy.oauth.AuthService;
+import com.skyversation.xjcy.service.AuthService;
 import com.skyversation.xjcy.util.FileUtil;
 import com.skyversation.xjcy.util.MessageManage;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/skyversation/xjcy/oauth/AuthService.java → src/main/java/com/skyversation/xjcy/service/AuthService.java

@@ -1,11 +1,10 @@
-package com.skyversation.xjcy.oauth;
+package com.skyversation.xjcy.service;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.skyversation.xjcy.bean.User;
 import com.skyversation.xjcy.dms.DMSColumn;
 import com.skyversation.xjcy.dms.DMSService;
-import com.skyversation.xjcy.service.WeChatService;
 import com.skyversation.xjcy.util.HttpUtil;
 import com.skyversation.xjcy.util.MessageManage;
 import com.skyversation.xjcy.util.ObfuscationUtils;

src/main/java/com/skyversation/xjcy/service/DataCountService.java

@@ -6,7 +6,6 @@ import com.skyversation.xjcy.bean.*;
 import com.skyversation.xjcy.dms.DMSQuery;
 import com.skyversation.xjcy.dms.DMSService;
 import com.skyversation.xjcy.enums.EnterpriseLevel;
-import com.skyversation.xjcy.oauth.AuthService;
 import com.skyversation.xjcy.util.SpecialisationStringCollector;
 import com.skyversation.xjcy.util.TimeUtil;
 import lombok.NoArgsConstructor;

src/main/java/com/skyversation/xjcy/service/DataExportService.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.skyversation.xjcy.bean.ClueFollow;
 import com.skyversation.xjcy.dms.DMSQuery;
 import com.skyversation.xjcy.dms.DMSService;
-import com.skyversation.xjcy.oauth.AuthService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

src/main/java/com/skyversation/xjcy/service/InvestmentPreCountService.java

@@ -6,7 +6,6 @@ import com.skyversation.xjcy.computer.InvestmentPreCounter;
 import com.skyversation.xjcy.dms.DMSColumn;
 import com.skyversation.xjcy.dms.DMSQuery;
 import com.skyversation.xjcy.dms.DMSService;
-import com.skyversation.xjcy.oauth.AuthService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

src/main/java/com/skyversation/xjcy/service/MessageService.java

@@ -1,16 +1,12 @@
 package com.skyversation.xjcy.service;
 
-import com.alibaba.fastjson.JSON;
 import com.skyversation.xjcy.bean.EnterpriseHealth;
 import com.skyversation.xjcy.bean.Message;
 import com.skyversation.xjcy.bean.User;
 import com.skyversation.xjcy.dms.DMSColumn;
 import com.skyversation.xjcy.dms.DMSService;
-import com.skyversation.xjcy.oauth.AuthService;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Service

src/main/java/com/skyversation/xjcy/service/ParkPreCountService.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.skyversation.xjcy.computer.ParkPreCounter;
 import com.skyversation.xjcy.dms.DMSColumn;
 import com.skyversation.xjcy.dms.DMSService;
-import com.skyversation.xjcy.oauth.AuthService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

src/main/java/com/skyversation/xjcy/oauth/PhoneService.java → src/main/java/com/skyversation/xjcy/service/PhoneService.java

@@ -1,11 +1,9 @@
-package com.skyversation.xjcy.oauth;
+package com.skyversation.xjcy.service;
 
-import com.skyversation.xjcy.service.PhoneMessageSendService;
 import com.skyversation.xjcy.util.cache.ExpirableCache;
 import com.skyversation.xjcy.util.cache.UnifiedExpirationGuavaCacheImpl;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;

src/main/java/com/skyversation/xjcy/service/SerialNumberGenerator.java

@@ -1,7 +1,6 @@
 package com.skyversation.xjcy.service;
 
 import com.skyversation.xjcy.dms.DMSService;
-import com.skyversation.xjcy.oauth.AuthService;
 import lombok.Getter;
 import org.springframework.stereotype.Service;
 

src/main/java/com/skyversation/xjcy/service/WxAuthServiceMock.java → src/main/java/com/skyversation/xjcy/service/WxServiceMock.java

@@ -1,9 +1,8 @@
 package com.skyversation.xjcy.service;
 
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
 
-public class WxAuthServiceMock extends WeChatService {
+public class WxServiceMock extends WeChatService {
     @Override
     public Result wxLogin(String code) {
         return new Result(true,null,"abc1234567890defabc1234567890def","");

src/main/java/com/skyversation/xjcy/util/MessageManage.java

@@ -107,6 +107,10 @@ public class MessageManage {
         log.info(json.toString());
         return json.toString();
     }
-
-
+    public static String error(int errorCode,String message){
+        return MessageManage.getInstance().getResultContent(errorCode, message, message);
+    }
+    public static String successWithNoData(String message){
+        return MessageManage.getInstance().getResultContent(200, message, message);
+    }
 }