修复一些问题

src/main/java/com/skyversation/xjcy/dms/DMSQuery.java

@@ -16,20 +16,20 @@ public enum DMSQuery {
 
     INDUSTRIAL_PARK(DMSColumn.INDUSTRIAL_PARK, IndustrialPark.class) {
         @Override
-        public DMSRequest preRequest(LocalDate now) {
-            return new DMSRequest();
+        public DMSQueryRequest preRequest(LocalDate now) {
+            return new DMSQueryRequest();
         }
     },
     ENTERPRISE(DMSColumn.ENTERPRISE, Enterprise.class) {
         @Override
-        public DMSRequest preRequest(LocalDate now) {
-            return new DMSRequest();
+        public DMSQueryRequest preRequest(LocalDate now) {
+            return new DMSQueryRequest();
         }
     },
     ECONOMIC_ALL_INDEED(DMSColumn.ENTERPRISE_ECONOMIC, EnterpriseEconomic.class) {
         @Override
-        public DMSRequest preRequest(LocalDate now) {
-            DMSRequest request = new DMSRequest();
+        public DMSQueryRequest preRequest(LocalDate now) {
+            DMSQueryRequest request = new DMSQueryRequest();
             Set<String> monthInDeed = new HashSet<>();
             monthInDeed.addAll(SpecialisationStringCollector.YearMonthByLast12Month(now));
             monthInDeed.addAll(SpecialisationStringCollector.YearMonthByYtd(now));
@@ -40,28 +40,28 @@ public enum DMSQuery {
     },
     ECONOMIC(DMSColumn.ENTERPRISE_ECONOMIC, EnterpriseEconomic.class) {
         @Override
-        public DMSRequest preRequest(LocalDate now) {
-            return new DMSRequest();
+        public DMSQueryRequest preRequest(LocalDate now) {
+            return new DMSQueryRequest();
         }
     },
     ORDER(DMSColumn.ORDER, Order.class) {
         @Override
-        public DMSRequest preRequest(LocalDate now) {
-            return new DMSRequest();
+        public DMSQueryRequest preRequest(LocalDate now) {
+            return new DMSQueryRequest();
         }
     },
     LAST_LEASE_DETAIL(DMSColumn.LEASE_DETAIL, LeaseDetail.class) {
         @Override
-        public DMSRequest preRequest(LocalDate now) {
-            DMSRequest request = new DMSRequest();
+        public DMSQueryRequest preRequest(LocalDate now) {
+            DMSQueryRequest request = new DMSQueryRequest();
             request.addWhere("c_is_latest_lease", "1", "2");
             return request;
         }
     },
     LAST_YEAR_LEASE_DETAIL(DMSColumn.LEASE_DETAIL, LeaseDetail.class) {
         @Override
-        public DMSRequest preRequest(LocalDate now) {
-            DMSRequest request = new DMSRequest();
+        public DMSQueryRequest preRequest(LocalDate now) {
+            DMSQueryRequest request = new DMSQueryRequest();
             LocalDate indeedStartTime = now.minusMonths(13).withDayOfMonth(1);
             LocalDate indeedEndTime = now.minusMonths(1)                     // 上个月
                     .withDayOfMonth(
@@ -78,21 +78,21 @@ public enum DMSQuery {
     },
     CLUE_FOLLOW(DMSColumn.CLUE_FOLLOW,ClueFollow.class) {
         @Override
-        DMSRequest preRequest(LocalDate now) {
-            return new DMSRequest();
+        DMSQueryRequest preRequest(LocalDate now) {
+            return new DMSQueryRequest();
         }
     },
     USER_BIND_ENTERPRISE(DMSColumn.USER,User.class) {
         @Override
-        public DMSRequest preRequest(LocalDate now) {
-            return new DMSRequest();
+        public DMSQueryRequest preRequest(LocalDate now) {
+            return new DMSQueryRequest();
         }
     };
 
     private final DMSColumn column;
     private final Class<? extends FromJSON> resultType;
 
-    abstract DMSRequest preRequest(LocalDate now);
+    abstract DMSQueryRequest preRequest(LocalDate now);
 
     public String getColumnId() {
         return column.getId();

src/main/java/com/skyversation/xjcy/dms/DMSRequest.java → src/main/java/com/skyversation/xjcy/dms/DMSQueryRequest.java

@@ -7,7 +7,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-class DMSRequest {
+public class DMSQueryRequest {
     DMSRequestType type;
     Map<String, String> params = new HashMap<>();
     String token;
@@ -43,7 +43,7 @@ class DMSRequest {
         this.where.add(where);
     }
 
-    void addOrder(DMSRequest request) {
+    void addOrder(DMSQueryRequest request) {
 
     }
 

src/main/java/com/skyversation/xjcy/dms/DMSService.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.skyversation.xjcy.bean.*;
-import com.skyversation.xjcy.service.AuthService;
 import com.skyversation.xjcy.util.HttpUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -35,7 +34,7 @@ public class DMSService {
 
     private final Map<DMSQuery, QueryResult> queryCache = new HashMap<>();
 
-    private JSONObject sendQueryToDms(DMSRequest request) {
+    private JSONObject sendQueryToDms(DMSQueryRequest request) {
         JSONObject jsonObject;
         MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
         request.params.forEach(params::add);
@@ -68,9 +67,9 @@ public class DMSService {
         return jsonObject;
     }
 
-    private List<JSONObject> queryDmsList(DMSRequest request, String token, String columnId) {
+    private List<JSONObject> queryDmsList(DMSQueryRequest request, String token, String columnId) {
         request.token = token;
-        if (request.type == null) request.type = DMSRequest.DMSRequestType.List;
+        if (request.type == null) request.type = DMSQueryRequest.DMSRequestType.List;
         request.setColumnId(columnId);
         request.setState();
         int page = 0;
@@ -102,7 +101,7 @@ public class DMSService {
     }
 
     public List<JSONObject> simpleQuery(String token, String columId) {
-        return queryDmsList(new DMSRequest(), token, columId);
+        return queryDmsList(new DMSQueryRequest(), token, columId);
     }
 
     public List<JSONObject> queryBeautified(String token, DMSColumn column) {
@@ -124,7 +123,7 @@ public class DMSService {
     }
 
     public int getLargestCode(String token, String columId, String codeColumn, String today) {
-        DMSRequest request = new DMSRequest();
+        DMSQueryRequest request = new DMSQueryRequest();
         request.addWhere(codeColumn, "2", "%" + today + "%");
         List<JSONObject> list = null;
         try {
@@ -228,8 +227,8 @@ public class DMSService {
     }
 
     public List<JSONObject> queryBeautifiedClue(String token, String cClueName, String cEnterpriseName, String constructionMethod, String timeStart, String timeEnd) {
-        DMSRequest request = new DMSRequest();
-        request.type = DMSRequest.DMSRequestType.Beautified;
+        DMSQueryRequest request = new DMSQueryRequest();
+        request.type = DMSQueryRequest.DMSRequestType.Beautified;
         if (cClueName != null) request.addWhere("c_clue_name", "2", cClueName);
         if (cEnterpriseName != null) request.addWhere("c_enterprise_name", "2", cEnterpriseName);
         if (constructionMethod != null) request.addWhere("construction_method", "2", constructionMethod);
@@ -238,8 +237,8 @@ public class DMSService {
     }
 
     public List<JSONObject> getUserJSONByCode(String userCode,String token) {
-        DMSRequest request = new DMSRequest();
-        request.type = DMSRequest.DMSRequestType.List;
+        DMSQueryRequest request = new DMSQueryRequest();
+        request.type = DMSQueryRequest.DMSRequestType.List;
         request.addWhere("c_usercode", "1", userCode);
         List<JSONObject> result = queryDmsList(request, token, DMSColumn.USER.getId());
         return result;
@@ -248,33 +247,33 @@ public class DMSService {
 
     //下面几个接口是重计算用的，有重新插入的需求，不能放进queryEnum，不能领域化
     public List<JSONObject> getAllParkByLy(String lyCode, String token) {
-        DMSRequest requestChildren = new DMSRequest();
+        DMSQueryRequest requestChildren = new DMSQueryRequest();
         requestChildren.addWhere("parent_cyy_code", "1", lyCode);
         List<JSONObject> result = queryDmsList(requestChildren, token, DMSColumn.INDUSTRIAL_PARK.getId());
-        DMSRequest requestFarther = new DMSRequest();
+        DMSQueryRequest requestFarther = new DMSQueryRequest();
         requestFarther.addWhere("c_park_code", "1", lyCode);
         result.addAll(queryDmsList(requestFarther, token, DMSColumn.INDUSTRIAL_PARK.getId()));
         return result;
     }
 
     public List<JSONObject> getAllPark(String token) {
-        DMSRequest request = new DMSRequest();
+        DMSQueryRequest request = new DMSQueryRequest();
         return queryDmsList(request, token, DMSColumn.INDUSTRIAL_PARK.getId());
     }
 
     public List<JSONObject> getAllLeaseByRooms(Set<String> roomString, String token) {
-        DMSRequest request = new DMSRequest();
+        DMSQueryRequest request = new DMSQueryRequest();
         request.addWhere("c_room_code", "5", roomString);
         return queryDmsList(request, token, DMSColumn.LEASE_DETAIL.getId());
     }
 
     public List<JSONObject> getAllLease(String token) {
-        DMSRequest request = new DMSRequest();
+        DMSQueryRequest request = new DMSQueryRequest();
         return queryDmsList(request, token, DMSColumn.LEASE_DETAIL.getId());
     }
 
     public List<JSONObject> getAllInvestmentTarget(String token) {
-        DMSRequest request = new DMSRequest();
+        DMSQueryRequest request = new DMSQueryRequest();
         return queryDmsList(request, token, DMSColumn.INVESTMENT_TARGET.getId());
     }
 }

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

@@ -15,6 +15,6 @@ public class WxServiceMock extends WeChatService {
 
     @Override
     public PhoneResult wxPhoneLogin(String jsCode) {
-        return new PhoneResult(true,null,"12345678910");
+        return new PhoneResult(true,null,"1234567test");
     }
 }

src/main/resources/application.yml

@@ -33,6 +33,7 @@ app:
   wechat:
     appid: ${XJCY_WECHAT_APPID:wx125843453562c86c}
     secret-key: ${XJCY_WECHAT_SECRET:6028cc345cfdbc76224d750a13519762}
+    enable: true
   aly:
     message:
       key: ${ALIBABA_CLOUD_ACCESS_KEY_ID:LTAI5tGkCWh7nvNzY5vKNWdZ}