项目部署

cathylogs · Jan 10, 2019 · 8635c76 · 8635c76
1 parent 749048b
commit 8635c76
Show file tree

Hide file tree

Showing 20 changed files with 95 additions and 98 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/leyou-api-gateway/pom.xml b/leyou-api-gateway/pom.xml
@@ -43,6 +43,7 @@
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
+
         <!--配置管理依赖-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>

diff --git a/leyou-api-gateway/src/main/resources/bootstrap.yml b/leyou-api-gateway/src/main/resources/bootstrap.yml
@@ -4,4 +4,4 @@ spring:
       name: gateway
       profile: dev
       label: master
-      uri: http://172.31.179.200:10011
+      uri: http://127.0.0.1:10011
diff --git a/leyou-authentication/leyou-authentication-service/src/main/resources/bootstrap.yml b/leyou-authentication/leyou-authentication-service/src/main/resources/bootstrap.yml
@@ -4,4 +4,4 @@ spring:
       name: auth
       profile: dev
       label: master
-      uri: http://172.31.179.200:10011
+      uri: http://127.0.0.1:10011
diff --git a/leyou-cart/src/main/java/com/leyou/cart/service/impl/CartServiceImpl.java b/leyou-cart/src/main/java/com/leyou/cart/service/impl/CartServiceImpl.java
@@ -12,7 +12,9 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.BoundHashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -30,6 +32,9 @@ public class CartServiceImpl implements CartService {
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
 
+    @Autowired
+    private RedisTemplate redisTemplate;
+
     @Autowired
     private GoodsClient goodsClient;
 
@@ -43,6 +48,8 @@ public class CartServiceImpl implements CartService {
      */
     @Override
     public void addCart(Cart cart) {
+
+
         //1.获取用户
         UserInfo userInfo = LoginInterceptor.getLoginUser();
         //2.Redis的key

diff --git a/leyou-cart/src/main/resources/bootstrap.yml b/leyou-cart/src/main/resources/bootstrap.yml
@@ -4,4 +4,4 @@ spring:
       name: cart
       profile: dev
       label: master
-      uri: http://172.31.179.200:10011
+      uri: http://127.0.0.1:10011
diff --git a/leyou-comments/leyou-comments-service/src/main/resources/bootstrap.yml b/leyou-comments/leyou-comments-service/src/main/resources/bootstrap.yml
@@ -4,4 +4,4 @@ spring:
       name: comments
       profile: dev
       label: master
-      uri: http://172.31.179.200:10011
+      uri: http://127.0.0.1:10011
diff --git a/leyou-config/src/main/resources/application.yml b/leyou-config/src/main/resources/application.yml
@@ -7,9 +7,9 @@ spring:
     config:
       server:
         git:
-          uri: https://gitee.com/lyj8330328/leyou-config-dev.git
+          uri: https://github.com/lyj8330328/leyou-config.git
   rabbitmq:
-    host: 47.104.175.20
+    host: 192.168.19.121
     username: /leyou
     password: leyou
     virtual-host: /leyou

diff --git a/leyou-goods-web/src/main/resources/bootstrap.yml b/leyou-goods-web/src/main/resources/bootstrap.yml
@@ -4,4 +4,4 @@ spring:
       name: goodsweb
       profile: dev
       label: master
-      uri: http://172.31.179.200:10011
+      uri: http://127.0.0.1:10011
diff --git a/leyou-goods-web/src/test/java/RedisTest.java b/leyou-goods-web/src/test/java/RedisTest.java
@@ -1,61 +1,63 @@
-//import com.leyou.LyGoodsWebApplication;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.data.redis.core.BoundHashOperations;
-//import org.springframework.data.redis.core.RedisTemplate;
-//import org.springframework.data.redis.core.StringRedisTemplate;
-//import org.springframework.test.context.junit4.SpringRunner;
-//
-//import java.util.HashMap;
-//import java.util.Map;
-//import java.util.concurrent.TimeUnit;
-//
-///**
-// * @Author: 98050
-// * @Time: 2018-10-25 22:58
-// * @Feature:
-// */
-//@RunWith(SpringRunner.class)
-//@SpringBootTest(classes = LyGoodsWebApplication.class)
-//public class RedisTest {
-//
-//    @Autowired
-//    private StringRedisTemplate stringRedisTemplate;
-//
-//    @Autowired
-//    private RedisTemplate<String, String> redisTemplate;
-//
-//    private static final String KEY_PREFIX = "leyou:seckill:test";
-//
-//    @Test
-//    public void testRedisObj() {
-//        //redisTemplate.opsForValue().set("111111111","2222221231232222222");
-//        //redisTemplate.opsForValue().set("key","1");
-//        redisTemplate.opsForValue().increment("key",1);
-//    }
-//
-//
-//    @Test
-//    public void test(){
-//        BoundHashOperations<String,Object,Object> hashOperations = this.stringRedisTemplate.boundHashOps("leyou:goods:detail:1");
-//        hashOperations.put("1","22222222");
-//        //hashOperations.expire(10, TimeUnit.SECONDS);
-//    }
-//
-//    @Test
-//    public void redisTest(){
-//        Map<String,String> result = new HashMap<>();
-//        BoundHashOperations<String,Object,Object> hashOperations = this.stringRedisTemplate.boundHashOps(KEY_PREFIX);
-//        hashOperations.put("1", "22");
-//        hashOperations.put("2", "22");
-//        hashOperations.put("3", "22");
-//
-//
-//        System.out.println("---------------------------------------------------------");
-//        hashOperations.entries().forEach((m,n) ->{
-//            System.out.println("key：" + m + "," + n);
-//        });
-//    }
-//}
+import com.leyou.LyGoodsWebApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.redis.core.BoundHashOperations;
+import org.springframework.data.redis.core.BoundValueOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author: 98050
+ * @Time: 2018-10-25 22:58
+ * @Feature:
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = LyGoodsWebApplication.class)
+public class RedisTest {
+
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Autowired
+    private RedisTemplate<String, String> redisTemplate;
+
+    private static final String KEY_PREFIX = "leyou:seckill:test";
+
+    @Test
+    public void testRedisObj() {
+        //redisTemplate.opsForValue().set("111111111","2222221231232222222");
+        //redisTemplate.opsForValue().set("key","1");
+        redisTemplate.opsForValue().increment("key",1);
+    }
+
+
+    @Test
+    public void test(){
+        BoundHashOperations<String,Object,Long> hashOperations = this.stringRedisTemplate.boundHashOps("leyou:goods:detail:1");
+        BoundValueOperations<String, String> valueOperations = this.stringRedisTemplate.boundValueOps("leyou:goods:detail:1");
+        valueOperations.set("123", 1);
+        //hashOperations.increment("123", 2);
+        //hashOperations.expire(10, TimeUnit.SECONDS);
+    }
+
+    @Test
+    public void redisTest(){
+        Map<String,String> result = new HashMap<>();
+        BoundHashOperations<String,Object,Object> hashOperations = this.stringRedisTemplate.boundHashOps(KEY_PREFIX);
+        hashOperations.put("1", "22");
+        hashOperations.put("2", "22");
+        hashOperations.put("3", "22");
+
+
+        System.out.println("---------------------------------------------------------");
+        hashOperations.entries().forEach((m,n) ->{
+            System.out.println("key：" + m + "," + n);
+        });
+    }
+}
diff --git a/leyou-item/leyou-item-service/src/main/resources/bootstrap.yml b/leyou-item/leyou-item-service/src/main/resources/bootstrap.yml
@@ -4,4 +4,4 @@ spring:
       name: item
       profile: dev
       label: master
-      uri: http://172.31.179.200:10011
+      uri: http://127.0.0.1:10011
diff --git a/leyou-order/leyou-order-service/src/main/resources/bootstrap.yml b/leyou-order/leyou-order-service/src/main/resources/bootstrap.yml
@@ -4,4 +4,4 @@ spring:
       name: order
       profile: dev
       label: master
-      uri: http://172.31.179.200:10011
+      uri: http://127.0.0.1:10011
diff --git a/leyou-registry/src/main/resources/bootstrap.yml b/leyou-registry/src/main/resources/bootstrap.yml
@@ -4,4 +4,4 @@ spring:
       name: registry
       profile: dev
       label: master
-      uri: http://172.31.179.200:10011
+      uri: http://127.0.0.1:10011
diff --git a/leyou-search/src/main/resources/bootstrap.yml b/leyou-search/src/main/resources/bootstrap.yml
@@ -4,4 +4,4 @@ spring:
       name: search
       profile: dev
       label: master
-      uri: http://172.31.179.200:10011
+      uri: http://127.0.0.1:10011
diff --git a/...l/leyou-seckill-service/src/main/java/com/leyou/seckill/controller/SeckillController.java b/...l/leyou-seckill-service/src/main/java/com/leyou/seckill/controller/SeckillController.java
@@ -86,25 +86,18 @@ public ResponseEntity<String> seckillOrder(@PathVariable("path") String path, @R
 
         //3.读取库存，减一后更新缓存
         BoundHashOperations<String,Object,Object> hashOperations = this.stringRedisTemplate.boundHashOps(KEY_PREFIX);
-        String s = (String) hashOperations.get(seckillGoods.getSkuId().toString());
-        if (s == null){
-            return ResponseEntity.ok(result);
-        }
-        int stock = Integer.valueOf(s) - 1;
+        Long stock = hashOperations.increment(seckillGoods.getSkuId().toString(), -1);
 
         //4.库存不足直接返回
         if (stock < 0){
             localOverMap.put(seckillGoods.getSkuId(),true);
             return ResponseEntity.ok(result);
         }
-        //5.更新库存
-        hashOperations.delete(seckillGoods.getSkuId().toString());
-        hashOperations.put(seckillGoods.getSkuId().toString(),String.valueOf(stock));
 
-        //6.库存充足，请求入队
-        //6.1 获取用户信息
+        //5.库存充足，请求入队
+        //5.1 获取用户信息
         SeckillMessage seckillMessage = new SeckillMessage(userInfo,seckillGoods);
-        //6.2 发送消息
+        //5.2 发送消息
         this.seckillService.sendMessage(seckillMessage);
 
 

diff --git a/leyou-secskill/leyou-seckill-service/src/main/resources/bootstrap.yml b/leyou-secskill/leyou-seckill-service/src/main/resources/bootstrap.yml
@@ -4,4 +4,4 @@ spring:
       name: seckill
       profile: dev
       label: master
-      uri: http://172.31.179.200:10011
+      uri: http://127.0.0.1:10011
diff --git a/leyou-sms/src/main/resources/bootstrap.yml b/leyou-sms/src/main/resources/bootstrap.yml
@@ -4,4 +4,4 @@ spring:
       name: sms
       profile: dev
       label: master
-      uri: http://172.31.179.200:10011
+      uri: http://127.0.0.1:10011
diff --git a/leyou-upload/src/main/resources/bootstrap.yml b/leyou-upload/src/main/resources/bootstrap.yml
@@ -4,4 +4,4 @@ spring:
       name: upload
       profile: dev
       label: master
-      uri: http://172.31.179.200:10011
+      uri: http://127.0.0.1:10011
diff --git a/leyou-user/leyou-user-service/src/main/resources/bootstrap.yml b/leyou-user/leyou-user-service/src/main/resources/bootstrap.yml
@@ -4,4 +4,4 @@ spring:
       name: user
       profile: dev
       label: master
-      uri: http://172.31.179.200:10011
+      uri: http://127.0.0.1:10011