#3 修改冲突的类名

Dataman-Cloud · Nov 27, 2017 · 8099876 · 8099876
1 parent f3818a6
commit 8099876
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/octopus-service/src/main/docker/Dockerfile b/octopus-service/src/main/docker/Dockerfile
@@ -0,0 +1,5 @@
+FROM anapsix/alpine-java:8
+VOLUME /tmp
+ADD octopus-service-master-SNAPSHOT.jar app.jar
+RUN bash -c 'touch /app.jar'
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
diff --git a/octopus-service/src/main/java/demo/job/ScanInventory.java b/octopus-service/src/main/java/demo/job/ScanInventory.java
@@ -6,7 +6,6 @@
 import com.vip.saturn.job.SaturnJobReturn;
 
 import org.apache.commons.lang.time.DateFormatUtils;
-import org.apache.commons.lang.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,9 +14,8 @@
 import java.util.List;
 import java.util.Map;
 
-import demo.service.StockServiceV1;
+import demo.service.StockService;
 import demo.util.JSONSerializer;
-import demo.v1.StockControllerV1;
 
 /**
  * 定时扫描仓库 java job TODO 测试，不加@RestController注解貌似不行
@@ -27,7 +25,7 @@ public class ScanInventory extends AbstractSaturnJavaJob {
     private Logger log = LoggerFactory.getLogger(ScanInventory.class);
 
     @Autowired
-    private StockServiceV1 stockServiceV1;
+    private StockService stockService;
 
     /**
      * Java定时作业的具体执行任务内容
@@ -42,7 +40,7 @@ public class ScanInventory extends AbstractSaturnJavaJob {
     public SaturnJobReturn handleJavaJob(final String jobName, final Integer shardItem, final String shardParam,
             final SaturnJobExecutionContext context) {
         //查询未同步数据
-        List<Map<String, Long>> stocks = stockServiceV1.getStockNoSync();
+        List<Map<String, Long>> stocks = stockService.getStockNoSync();
         String stocksStr = JSONSerializer.objToJson(stocks);
         System.out.print(String.format("扫描到进货商品：[%s] 时间：" + DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"),
                 stocksStr));

diff --git a/octopus-service/src/main/java/demo/job/SyncInventory.java b/octopus-service/src/main/java/demo/job/SyncInventory.java
@@ -12,8 +12,7 @@
 import java.util.List;
 import java.util.Map;
 
-import demo.service.StockServiceV1;
-import demo.stock.Stock;
+import demo.service.StockService;
 import demo.util.JSONSerializer;
 
 /**
@@ -24,7 +23,7 @@ public class SyncInventory extends OctopusJavaMsgJob {
     private Logger log = LoggerFactory.getLogger(ScanInventory.class);
 
     @Autowired
-    private StockServiceV1 stockServiceV1;
+    private StockService stockService;
 
     /**
      * Java消息作业的具体执行任务内容
@@ -60,9 +59,9 @@ public SaturnJobReturn handleMsgJob(String jobName, Integer key, String value, M
                 productNum = (Long)stock.get("productNum");
 
                 //在商品数量信息同步修改到库存表中
-                stockServiceV1.modifyStockState(productId);
+                stockService.modifyStockState(productId);
                 //修改商品库存数量
-                stockServiceV1.modifyProductNum(productId, productNum);
+                stockService.modifyProductNum(productId, productNum);
 
                 result = String.format("同步商品编号为：" + productId + "数量为：" + productNum + "成功！" + DateFormatUtils.format(new
                                 Date(),

diff --git a/...ain/java/demo/service/StockServiceV1.java → .../main/java/demo/service/StockService.java b/...ain/java/demo/service/StockServiceV1.java → .../main/java/demo/service/StockService.java
@@ -16,12 +16,12 @@
 import demo.stock.Stock;
 
 @Service
-public class StockServiceV1 {
+public class StockService {
 
     private RestTemplate restTemplate;
 
     @Autowired
-    public StockServiceV1(@LoadBalanced RestTemplate restTemplate) {
+    public StockService(@LoadBalanced RestTemplate restTemplate) {
         this.restTemplate = restTemplate;
     }
 

diff --git a/payment-service/pom.xml b/payment-service/pom.xml
@@ -26,6 +26,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-redis</artifactId>
+            <version>1.4.7.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>