refactor project structure

FudanSELab · Mar 5, 2019 · 8b6293d · 8b6293d
1 parent f868d8f
commit 8b6293d
Show file tree

Hide file tree

Showing 312 changed files with 502 additions and 578 deletions.
diff --git a/kubernetes-services/skydns-rc.yaml b/kubernetes-services/skydns-rc.yaml
@@ -59,8 +59,8 @@ spec:
           initialDelaySeconds: 3
           timeoutSeconds: 5
         args:
-        # - --domain=cluster.local.
-        - --domain=cluster.local.
+        # - --entity=cluster.local.
+        - --entity=cluster.local.
         - --dns-port=10053
         - --config-map=kube-dns
         # This should be set to v=2 only after the new image (cut from 1.5) has

diff --git a/...dmin-basic-info-service/src/main/java/adminbasic/controller/AdminBasicInfoController.java b/...dmin-basic-info-service/src/main/java/adminbasic/controller/AdminBasicInfoController.java
@@ -1,11 +1,6 @@
 package adminbasic.controller;
 
-import adminbasic.domin.bean.Config;
-import adminbasic.domin.bean.Contacts;
-import adminbasic.domin.bean.Station;
-import adminbasic.domin.bean.TrainType;
-import adminbasic.domin.info.*;
-import adminbasic.domin.reuslt.*;
+import adminbasic.entity.*;
 import adminbasic.service.AdminBasicInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;

diff --git a/...dminbasic/domin/info/AddContactsInfo.java → ...va/adminbasic/entity/AddContactsInfo.java b/...dminbasic/domin/info/AddContactsInfo.java → ...va/adminbasic/entity/AddContactsInfo.java
@@ -1,4 +1,4 @@
-package adminbasic.domin.info;
+package adminbasic.entity;
 
 public class AddContactsInfo {
 

diff --git a/...basic/domin/reuslt/AddContactsResult.java → .../adminbasic/entity/AddContactsResult.java b/...basic/domin/reuslt/AddContactsResult.java → .../adminbasic/entity/AddContactsResult.java
@@ -1,6 +1,6 @@
-package adminbasic.domin.reuslt;
+package adminbasic.entity;
 
-import adminbasic.domin.bean.Contacts;
+import adminbasic.entity.Contacts;
 
 public class AddContactsResult {
 

diff --git a/...adminbasic/domin/info/AdminLoginInfo.java → ...ava/adminbasic/entity/AdminLoginInfo.java b/...adminbasic/domin/info/AdminLoginInfo.java → ...ava/adminbasic/entity/AdminLoginInfo.java
@@ -1,4 +1,4 @@
-package adminbasic.domin.info;
+package adminbasic.entity;
 
 public class AdminLoginInfo {
 

diff --git a/...in/java/adminbasic/domin/bean/Config.java → ...c/main/java/adminbasic/entity/Config.java b/...in/java/adminbasic/domin/bean/Config.java → ...c/main/java/adminbasic/entity/Config.java
@@ -1,4 +1,4 @@
-package adminbasic.domin.bean;
+package adminbasic.entity;
 
 
 

diff --git a/...va/adminbasic/domin/info/ConfigInfo2.java → ...n/java/adminbasic/entity/ConfigInfo2.java b/...va/adminbasic/domin/info/ConfigInfo2.java → ...n/java/adminbasic/entity/ConfigInfo2.java
@@ -1,4 +1,4 @@
-package adminbasic.domin.info;
+package adminbasic.entity;
 
 public class ConfigInfo2 {
 

diff --git a/.../java/adminbasic/domin/bean/Contacts.java → ...main/java/adminbasic/entity/Contacts.java b/.../java/adminbasic/domin/bean/Contacts.java → ...main/java/adminbasic/entity/Contacts.java
@@ -1,4 +1,4 @@
-package adminbasic.domin.bean;
+package adminbasic.entity;
 
 import java.io.Serializable;
 import java.util.UUID;

diff --git a/...nbasic/domin/info/DeleteContactsInfo.java → ...adminbasic/entity/DeleteContactsInfo.java b/...nbasic/domin/info/DeleteContactsInfo.java → ...adminbasic/entity/DeleteContactsInfo.java
@@ -1,4 +1,4 @@
-package adminbasic.domin.info;
+package adminbasic.entity;
 
 public class DeleteContactsInfo {
 

diff --git a/...ic/domin/reuslt/DeleteContactsResult.java → ...minbasic/entity/DeleteContactsResult.java b/...ic/domin/reuslt/DeleteContactsResult.java → ...minbasic/entity/DeleteContactsResult.java
@@ -1,4 +1,4 @@
-package adminbasic.domin.reuslt;
+package adminbasic.entity;
 
 
 public class DeleteContactsResult {

diff --git a/...asic/domin/reuslt/GetAllConfigResult.java → ...adminbasic/entity/GetAllConfigResult.java b/...asic/domin/reuslt/GetAllConfigResult.java → ...adminbasic/entity/GetAllConfigResult.java
@@ -1,6 +1,6 @@
-package adminbasic.domin.reuslt;
+package adminbasic.entity;
 
-import adminbasic.domin.bean.Config;
+import adminbasic.entity.Config;
 
 import java.util.List;
 

diff --git a/...ic/domin/reuslt/GetAllContactsResult.java → ...minbasic/entity/GetAllContactsResult.java b/...ic/domin/reuslt/GetAllContactsResult.java → ...minbasic/entity/GetAllContactsResult.java
@@ -1,6 +1,6 @@
-package adminbasic.domin.reuslt;
+package adminbasic.entity;
 
-import adminbasic.domin.bean.Contacts;
+import adminbasic.entity.Contacts;
 
 import java.util.ArrayList;
 

diff --git a/...basic/domin/reuslt/GetAllPriceResult.java → .../adminbasic/entity/GetAllPriceResult.java b/...basic/domin/reuslt/GetAllPriceResult.java → .../adminbasic/entity/GetAllPriceResult.java
@@ -1,6 +1,6 @@
-package adminbasic.domin.reuslt;
+package adminbasic.entity;
 
-import adminbasic.domin.bean.PriceConfig;
+import adminbasic.entity.PriceConfig;
 
 import java.util.List;
 

diff --git a/...sic/domin/reuslt/GetAllStationResult.java → ...dminbasic/entity/GetAllStationResult.java b/...sic/domin/reuslt/GetAllStationResult.java → ...dminbasic/entity/GetAllStationResult.java
@@ -1,6 +1,6 @@
-package adminbasic.domin.reuslt;
+package adminbasic.entity;
 
-import adminbasic.domin.bean.Station;
+import adminbasic.entity.Station;
 
 import java.util.List;
 

diff --git a/...basic/domin/reuslt/GetAllTrainResult.java → .../adminbasic/entity/GetAllTrainResult.java b/...basic/domin/reuslt/GetAllTrainResult.java → .../adminbasic/entity/GetAllTrainResult.java
@@ -1,6 +1,6 @@
-package adminbasic.domin.reuslt;
+package adminbasic.entity;
 
-import adminbasic.domin.bean.TrainType;
+import adminbasic.entity.TrainType;
 
 import java.util.List;
 

diff --git a/...nbasic/domin/info/ModifyContactsInfo.java → ...adminbasic/entity/ModifyContactsInfo.java b/...nbasic/domin/info/ModifyContactsInfo.java → ...adminbasic/entity/ModifyContactsInfo.java
@@ -1,4 +1,4 @@
-package adminbasic.domin.info;
+package adminbasic.entity;
 
 public class ModifyContactsInfo {
 

diff --git a/...ic/domin/reuslt/ModifyContactsResult.java → ...minbasic/entity/ModifyContactsResult.java b/...ic/domin/reuslt/ModifyContactsResult.java → ...minbasic/entity/ModifyContactsResult.java
@@ -1,6 +1,6 @@
-package adminbasic.domin.reuslt;
+package adminbasic.entity;
 
-import adminbasic.domin.bean.Contacts;
+import adminbasic.entity.Contacts;
 
 public class ModifyContactsResult {
 

diff --git a/...va/adminbasic/domin/bean/PriceConfig.java → ...n/java/adminbasic/entity/PriceConfig.java b/...va/adminbasic/domin/bean/PriceConfig.java → ...n/java/adminbasic/entity/PriceConfig.java
@@ -1,4 +1,4 @@
-package adminbasic.domin.bean;
+package adminbasic.entity;
 
 public class PriceConfig {
 

diff --git a/...java/adminbasic/domin/info/PriceInfo.java → ...ain/java/adminbasic/entity/PriceInfo.java b/...java/adminbasic/domin/info/PriceInfo.java → ...ain/java/adminbasic/entity/PriceInfo.java
@@ -1,4 +1,4 @@
-package adminbasic.domin.info;
+package adminbasic.entity;
 
 public class PriceInfo {
 

diff --git a/...reuslt/ReturnSinglePriceConfigResult.java → ...entity/ReturnSinglePriceConfigResult.java b/...reuslt/ReturnSinglePriceConfigResult.java → ...entity/ReturnSinglePriceConfigResult.java
@@ -1,6 +1,6 @@
-package adminbasic.domin.reuslt;
+package adminbasic.entity;
 
-import adminbasic.domin.info.PriceInfo;
+import adminbasic.entity.PriceInfo;
 
 public class ReturnSinglePriceConfigResult {
 

diff --git a/...n/java/adminbasic/domin/bean/Station.java → .../main/java/adminbasic/entity/Station.java b/...n/java/adminbasic/domin/bean/Station.java → .../main/java/adminbasic/entity/Station.java
@@ -1,4 +1,4 @@
-package adminbasic.domin.bean;
+package adminbasic.entity;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;

diff --git a/...va/adminbasic/domin/info/StationInfo.java → ...n/java/adminbasic/entity/StationInfo.java b/...va/adminbasic/domin/info/StationInfo.java → ...n/java/adminbasic/entity/StationInfo.java
@@ -1,4 +1,4 @@
-package adminbasic.domin.info;
+package adminbasic.entity;
 
 public class StationInfo {
 

diff --git a/...ava/adminbasic/domin/info/TrainInfo2.java → ...in/java/adminbasic/entity/TrainInfo2.java b/...ava/adminbasic/domin/info/TrainInfo2.java → ...in/java/adminbasic/entity/TrainInfo2.java
@@ -1,4 +1,4 @@
-package adminbasic.domin.info;
+package adminbasic.entity;
 
 
 public class TrainInfo2 {

diff --git a/...java/adminbasic/domin/bean/TrainType.java → ...ain/java/adminbasic/entity/TrainType.java b/...java/adminbasic/domin/bean/TrainType.java → ...ain/java/adminbasic/entity/TrainType.java
@@ -1,4 +1,4 @@
-package adminbasic.domin.bean;
+package adminbasic.entity;
 
 
 

diff --git a/ts-admin-basic-info-service/src/main/java/adminbasic/service/AdminBasicInfoService.java b/ts-admin-basic-info-service/src/main/java/adminbasic/service/AdminBasicInfoService.java
@@ -1,11 +1,6 @@
 package adminbasic.service;
 
-import adminbasic.domin.bean.Config;
-import adminbasic.domin.bean.Contacts;
-import adminbasic.domin.bean.Station;
-import adminbasic.domin.bean.TrainType;
-import adminbasic.domin.info.*;
-import adminbasic.domin.reuslt.*;
+import adminbasic.entity.*;
 import org.springframework.http.HttpHeaders;
 
 public interface AdminBasicInfoService {

diff --git a/ts-admin-basic-info-service/src/main/java/adminbasic/service/AdminBasicInfoServiceImpl.java b/ts-admin-basic-info-service/src/main/java/adminbasic/service/AdminBasicInfoServiceImpl.java
@@ -1,8 +1,6 @@
 package adminbasic.service;
 
-import adminbasic.domin.bean.*;
-import adminbasic.domin.info.*;
-import adminbasic.domin.reuslt.*;
+import adminbasic.entity.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;

diff --git a/ts-admin-order-service/src/main/java/adminorder/controller/AdminOrderController.java b/ts-admin-order-service/src/main/java/adminorder/controller/AdminOrderController.java
@@ -1,12 +1,12 @@
 package adminorder.controller;
 
-import adminorder.domain.request.AddOrderRequest;
-import adminorder.domain.request.DeleteOrderRequest;
-import adminorder.domain.request.UpdateOrderRequest;
-import adminorder.domain.response.AddOrderResult;
-import adminorder.domain.response.DeleteOrderResult;
-import adminorder.domain.response.GetAllOrderResult;
-import adminorder.domain.response.UpdateOrderResult;
+import adminorder.entity.AddOrderRequest;
+import adminorder.entity.DeleteOrderRequest;
+import adminorder.entity.UpdateOrderRequest;
+import adminorder.entity.AddOrderResult;
+import adminorder.entity.DeleteOrderResult;
+import adminorder.entity.GetAllOrderResult;
+import adminorder.entity.UpdateOrderResult;
 import adminorder.service.AdminOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;

diff --git a/ts-admin-order-service/src/main/java/adminorder/domain/bean/OrderStatus.java b/ts-admin-order-service/src/main/java/adminorder/domain/bean/OrderStatus.java
diff --git a/ts-admin-order-service/src/main/java/adminorder/domain/bean/SeatClass.java b/ts-admin-order-service/src/main/java/adminorder/domain/bean/SeatClass.java
diff --git a/...order/domain/request/AddOrderRequest.java → ...va/adminorder/entity/AddOrderRequest.java b/...order/domain/request/AddOrderRequest.java → ...va/adminorder/entity/AddOrderRequest.java
@@ -1,6 +1,4 @@
-package adminorder.domain.request;
-
-import adminorder.domain.bean.Order;
+package adminorder.entity;
 
 public class AddOrderRequest {
     private String loginid;

diff --git a/...order/domain/response/AddOrderResult.java → ...ava/adminorder/entity/AddOrderResult.java b/...order/domain/response/AddOrderResult.java → ...ava/adminorder/entity/AddOrderResult.java
@@ -1,6 +1,4 @@
-package adminorder.domain.response;
-
-import adminorder.domain.bean.Order;
+package adminorder.entity;
 
 public class AddOrderResult {
     private boolean status;

diff --git a/...minorder/domain/bean/DeleteOrderInfo.java → ...va/adminorder/entity/DeleteOrderInfo.java b/...minorder/domain/bean/DeleteOrderInfo.java → ...va/adminorder/entity/DeleteOrderInfo.java
@@ -1,4 +1,4 @@
-package adminorder.domain.bean;
+package adminorder.entity;
 
 public class DeleteOrderInfo {
 

diff --git a/...er/domain/request/DeleteOrderRequest.java → ...adminorder/entity/DeleteOrderRequest.java b/...er/domain/request/DeleteOrderRequest.java → ...adminorder/entity/DeleteOrderRequest.java
@@ -1,6 +1,4 @@
-package adminorder.domain.request;
-
-import adminorder.domain.bean.Order;
+package adminorder.entity;
 
 public class DeleteOrderRequest {
     private String loginid;

diff --git a/...er/domain/response/DeleteOrderResult.java → .../adminorder/entity/DeleteOrderResult.java b/...er/domain/response/DeleteOrderResult.java → .../adminorder/entity/DeleteOrderResult.java
@@ -1,4 +1,4 @@
-package adminorder.domain.response;
+package adminorder.entity;
 
 public class DeleteOrderResult {
 

diff --git a/...er/domain/response/GetAllOrderResult.java → .../adminorder/entity/GetAllOrderResult.java b/...er/domain/response/GetAllOrderResult.java → .../adminorder/entity/GetAllOrderResult.java
@@ -1,6 +1,4 @@
-package adminorder.domain.response;
-
-import adminorder.domain.bean.Order;
+package adminorder.entity;
 
 import java.util.ArrayList;
 

diff --git a/...in/java/adminorder/domain/bean/Order.java → ...rc/main/java/adminorder/entity/Order.java b/...in/java/adminorder/domain/bean/Order.java → ...rc/main/java/adminorder/entity/Order.java
@@ -1,4 +1,4 @@
-package adminorder.domain.bean;
+package adminorder.entity;
 
 import org.springframework.data.annotation.Id;
 import java.util.Date;

diff --git a/...va/inside_payment/domain/OrderStatus.java → ...n/java/adminorder/entity/OrderStatus.java b/...va/inside_payment/domain/OrderStatus.java → ...n/java/adminorder/entity/OrderStatus.java
@@ -1,4 +1,4 @@
-package inside_payment.domain;
+package adminorder.entity;
 
 public enum OrderStatus {
 

diff --git a/...der/domain/response/QueryOrderResult.java → ...a/adminorder/entity/QueryOrderResult.java b/...der/domain/response/QueryOrderResult.java → ...a/adminorder/entity/QueryOrderResult.java
@@ -1,6 +1,4 @@
-package adminorder.domain.response;
-
-import adminorder.domain.bean.Order;
+package adminorder.entity;
 
 import java.util.ArrayList;
 

diff --git a/...java/inside_payment/domain/SeatClass.java → ...ain/java/adminorder/entity/SeatClass.java b/...java/inside_payment/domain/SeatClass.java → ...ain/java/adminorder/entity/SeatClass.java
@@ -1,4 +1,4 @@
-package inside_payment.domain;
+package adminorder.entity;
 
 public enum SeatClass {
 

diff --git a/...er/domain/request/UpdateOrderRequest.java → ...adminorder/entity/UpdateOrderRequest.java b/...er/domain/request/UpdateOrderRequest.java → ...adminorder/entity/UpdateOrderRequest.java
@@ -1,6 +1,4 @@
-package adminorder.domain.request;
-
-import adminorder.domain.bean.Order;
+package adminorder.entity;
 
 public class UpdateOrderRequest {
     private String loginid;

diff --git a/...er/domain/response/UpdateOrderResult.java → .../adminorder/entity/UpdateOrderResult.java b/...er/domain/response/UpdateOrderResult.java → .../adminorder/entity/UpdateOrderResult.java
@@ -1,6 +1,4 @@
-package adminorder.domain.response;
-
-import adminorder.domain.bean.Order;
+package adminorder.entity;
 
 public class UpdateOrderResult {
     private boolean status;