diff --git a/collect.sql b/collect.sql
new file mode 100644
index 0000000..f505284
--- /dev/null
+++ b/collect.sql
@@ -0,0 +1,31 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server : 本机MySQL
+ Source Server Type : MySQL
+ Source Server Version : 80034 (8.0.34)
+ Source Host : localhost:3306
+ Source Schema : elm
+
+ Target Server Type : MySQL
+ Target Server Version : 80034 (8.0.34)
+ File Encoding : 65001
+
+ Date: 22/04/2024 14:40:21
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for collect
+-- ----------------------------
+DROP TABLE IF EXISTS `collect`;
+CREATE TABLE `collect` (
+ `collectId` int NOT NULL AUTO_INCREMENT,
+ `businessId` int NULL DEFAULT NULL,
+ `userId` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL,
+ PRIMARY KEY (`collectId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/elmclient/src/router/index.js b/elmclient/src/router/index.js
index 2451912..5c3b54a 100644
--- a/elmclient/src/router/index.js
+++ b/elmclient/src/router/index.js
@@ -21,6 +21,7 @@ import SearchResults from "../views/SearchResults";
import PointStore from '../views/PointStore.vue';
import CouponDetails from '../views/CouponDetails.vue';
import CouponSelect from '../views/CouponSelect.vue';
+import CollectList from '../views/CollectList.vue'
const routes = [{
@@ -104,6 +105,11 @@ const routes = [{
path: '/CouponSelect',
name: 'CouponSelect',
component: CouponSelect
+ },
+ {
+ path: '/collectList',
+ name: 'CollectList',
+ component: CollectList
}
];
diff --git a/elmclient/src/views/BusinessInfo.vue b/elmclient/src/views/BusinessInfo.vue
index 860ab0e..60ea72f 100644
--- a/elmclient/src/views/BusinessInfo.vue
+++ b/elmclient/src/views/BusinessInfo.vue
@@ -17,6 +17,13 @@
¥{{business.starPrice}}起送 ¥{{business.deliveryPrice}}配送
{{business.businessExplain}}
+
+
+ 取消收藏
+
+
+ 收藏
+
@@ -84,7 +91,8 @@
longPress: false,
pressTimer: null,
interval: 200,
- clickTimeouts: [] // 用于存储每个按钮的定时器
+ clickTimeouts: [], // 用于存储每个按钮的定时器
+ isCollected: false
}
},
created() {
@@ -104,11 +112,26 @@
}).catch(error => {
console.error(error);
});
+ this.listCollect()
},
methods: {
back() {
this.$router.go(-1);
},
+ async listCollect() {
+ let url = `CollectController/listCollect/${this.user.userId}`
+ await this.$axios.get(url).then(response => {
+ this.collectList = response.data.result;
+ }).catch(error => {
+ console.error(error);
+ });
+ for(let i of this.collectList){
+ if(`${i.businessId}`===this.businessId){
+ this.isCollected=true
+ break
+ }
+ }
+ },
listCart() {
let url=`CartController/listCart/${this.user.userId}/${this.businessId}`
this.$axios.get(url).then(response => {
@@ -214,7 +237,18 @@
businessId: this.business.businessId
}
});
- }
+ },
+ toggleCollect(business) {
+ this.isCollected = !this.isCollected; // 切换收藏状态
+ let method = this.isCollected ? 'post' : 'delete';
+ let url = `CollectController/${method === 'post' ? 'add' : 'delete'}Collect/${this.user.userId}/${this.businessId}`;
+ this.$axios({
+ method: method,
+ url: url
+ }).then().catch(error => {
+ console.error(error);
+ });
+ }
},
computed: {
//食品总价格
@@ -317,6 +351,31 @@
margin-top: 1.2vw;
}
+ /****************收藏按钮***************/
+ .wrapper .collect-button0 {
+ position: fixed;
+ font-size: 3vw;
+ color: white;
+ background-color: gray;
+ align-items: center;
+ justify-content: center;
+ padding: 1vw;
+ right: 0;
+ top: 13vw;
+ }
+
+ .wrapper .collect-button1 {
+ position: fixed;
+ font-size: 3vw;
+ color: white;
+ background-color: #01B0F2;
+ align-items: center;
+ justify-content: center;
+ padding: 1vw;
+ right: 0;
+ top: 13vw;
+ }
+
/****************食品信息部分***************/
.wrapper .food {
width: 100%;
diff --git a/elmclient/src/views/CollectList.vue b/elmclient/src/views/CollectList.vue
new file mode 100644
index 0000000..949840e
--- /dev/null
+++ b/elmclient/src/views/CollectList.vue
@@ -0,0 +1,189 @@
+
+
+
+
+
+
+
+ -
+
+
+
![]()
+
+
+
{{item.businessName}}
+
¥{{item.starPrice}}起送 | ¥{{item.deliveryPrice}}配送
+
{{item.businessExplain}}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/elmclient/src/views/My.vue b/elmclient/src/views/My.vue
index 10bc7a5..c46bf7a 100644
--- a/elmclient/src/views/My.vue
+++ b/elmclient/src/views/My.vue
@@ -1,72 +1,72 @@
-
+
-
-
-
-
-

-
-
-
-
-
+
+
+

+
+
+
+
+
-
-
-
+
-
-
+
+
\ No newline at end of file
diff --git a/springcloud_elm/.idea/compiler.xml b/springcloud_elm/.idea/compiler.xml
index e7e0cbf..3860b73 100644
--- a/springcloud_elm/.idea/compiler.xml
+++ b/springcloud_elm/.idea/compiler.xml
@@ -11,12 +11,13 @@
-
+
+
-
+
diff --git a/springcloud_elm/.idea/encodings.xml b/springcloud_elm/.idea/encodings.xml
index 95f9a58..2b605fe 100644
--- a/springcloud_elm/.idea/encodings.xml
+++ b/springcloud_elm/.idea/encodings.xml
@@ -9,6 +9,8 @@
+
+
diff --git a/springcloud_elm/.idea/runConfigurations/collect_server_10800.xml b/springcloud_elm/.idea/runConfigurations/collect_server_10800.xml
new file mode 100644
index 0000000..9e47b06
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/collect_server_10800.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springcloud_elm/.idea/sqldialects.xml b/springcloud_elm/.idea/sqldialects.xml
index c724144..56782ca 100644
--- a/springcloud_elm/.idea/sqldialects.xml
+++ b/springcloud_elm/.idea/sqldialects.xml
@@ -1,7 +1,6 @@
-
\ No newline at end of file
diff --git a/springcloud_elm/collect_server_10800/pom.xml b/springcloud_elm/collect_server_10800/pom.xml
new file mode 100644
index 0000000..b3a7d0b
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/pom.xml
@@ -0,0 +1,69 @@
+
+
+ 4.0.0
+
+ com.neusoft
+ springcloud_elm
+ 1.0-SNAPSHOT
+
+
+ collect_server_10800
+
+
+ 8
+ 8
+ UTF-8
+
+
+
+ org.springframework.cloud
+ spring-cloud-bus
+
+
+ org.springframework.cloud
+ spring-cloud-stream-binder-rabbit
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+ org.springframework.cloud
+ spring-cloud-starter-config
+
+
+ org.springframework.cloud
+ spring-cloud-starter-netflix-eureka-client
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ org.mybatis.spring.boot
+ mybatis-spring-boot-starter
+ 2.0.1
+
+
+ mysql
+ mysql-connector-java
+ 8.0.20
+ runtime
+
+
+
+ org.springframework.boot
+ spring-boot-devtools
+ runtime
+ true
+
+
+ com.neusoft
+ business_server_10300
+ 1.0-SNAPSHOT
+
+
+
+
\ No newline at end of file
diff --git a/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/MyApplication.java b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/MyApplication.java
new file mode 100644
index 0000000..a57a16e
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/MyApplication.java
@@ -0,0 +1,15 @@
+package com.neusoft;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @author qq
+ * @version 1.0
+ */
+@SpringBootApplication
+public class MyApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(MyApplication.class, args);
+ }
+}
diff --git a/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/controller/CollectController.java b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/controller/CollectController.java
new file mode 100644
index 0000000..98f75c1
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/controller/CollectController.java
@@ -0,0 +1,59 @@
+package com.neusoft.controller;
+
+import com.neusoft.po.Collect;
+import com.neusoft.po.CommonResult;
+import com.neusoft.service.CollectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author qq
+ * @version 1.0
+ */
+@RefreshScope
+@RestController
+@RequestMapping("/CollectController")
+public class CollectController {
+ @Autowired
+ private CollectService collectService;
+
+ @GetMapping("/listCollect/{userId}")
+ public CommonResult> listCollect(@PathVariable("userId") String userId) throws Exception {
+ Collect param = new Collect();
+ param.setUserId(userId);
+ List list = collectService.getCollectList(param);
+ return new CommonResult<>(200, "success", list);
+ }
+ @PostMapping("/addCollect/{userId}/{businessId}")
+ public CommonResult addCollect(
+ @PathVariable("userId") String userId,
+ @PathVariable("businessId") Integer businessId) throws Exception {
+ Collect param = new Collect();
+ param.setUserId(userId);
+ param.setBusinessId(businessId);
+ Integer result = collectService.addCollect(param);
+ return new CommonResult<>(200,"success", result);
+ }
+ @DeleteMapping("/deleteCollect/{userId}/{businessId}")
+ public CommonResult deleteCollect(@PathVariable("userId") String userId,
+ @PathVariable("businessId") Integer businessId) throws Exception {
+ Collect param = new Collect();
+ param.setUserId(userId);
+ param.setBusinessId(businessId);
+ Integer result = collectService.deleteCollect(param);
+ return new CommonResult<>(200, "success", result);
+ }
+ @PostMapping("/updateCollect/{userId}/{foodId}")
+ public CommonResult updateCollectFood(@PathVariable("userId") String userId,
+ @PathVariable("businessId") Integer businessId) throws Exception {
+ Collect param = new Collect();
+ param.setUserId(userId);
+ param.setBusinessId(businessId);
+ Integer result = collectService.updateCollect(param);
+ return new CommonResult<>(200, "success", result);
+ }
+
+}
diff --git a/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/mapper/CollectMapper.java b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/mapper/CollectMapper.java
new file mode 100644
index 0000000..828af87
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/mapper/CollectMapper.java
@@ -0,0 +1,28 @@
+package com.neusoft.mapper;
+
+import com.neusoft.po.Business;
+import com.neusoft.po.Collect;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+/**
+ * @author qq
+ * @version 1.0
+ */
+@Mapper
+public interface CollectMapper {
+ //public List listCollect(Collect collect);
+
+ //@Select("select * from collect where userId=#{userId}")
+ public List listCollect(Collect collect);
+ //@Delete("delete from collect where collectId=#{collectId}")
+ public Integer deleteCollectById(Collect collect);
+ @Select("insert into collect(userId,businessId) values(#{userId},#{businessId})")
+ public Integer insertCollect(Collect collect);
+ @Update("update collect set businessId=#{businessId} where collectId={collectId}")
+ public Integer updateCollectById(Collect collect);
+}
diff --git a/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/Business.java b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/Business.java
new file mode 100644
index 0000000..410bdf7
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/Business.java
@@ -0,0 +1,96 @@
+package com.neusoft.po;
+
+import java.util.List;
+
+public class Business {
+ private Integer businessId;
+ private String businessName;
+ private String businessAddress;
+ private String businessExplain;
+ private String businessImg;
+ private Integer orderTypeId;
+ private double starPrice;
+ private double deliveryPrice;
+ private String remarks;
+ private List foodList;
+
+ public Integer getBusinessId() {
+ return businessId;
+ }
+
+ public void setBusinessId(Integer businessId) {
+ this.businessId = businessId;
+ }
+
+ public String getBusinessName() {
+ return businessName;
+ }
+
+ public void setBusinessName(String businessName) {
+ this.businessName = businessName;
+ }
+
+ public String getBusinessAddress() {
+ return businessAddress;
+ }
+
+ public void setBusinessAddress(String businessAddress) {
+ this.businessAddress = businessAddress;
+ }
+
+ public String getBusinessExplain() {
+ return businessExplain;
+ }
+
+ public void setBusinessExplain(String businessExplain) {
+ this.businessExplain = businessExplain;
+ }
+
+ public String getBusinessImg() {
+ return businessImg;
+ }
+
+ public void setBusinessImg(String businessImg) {
+ this.businessImg = businessImg;
+ }
+
+ public Integer getOrderTypeId() {
+ return orderTypeId;
+ }
+
+ public void setOrderTypeId(Integer orderTypeId) {
+ this.orderTypeId = orderTypeId;
+ }
+
+ public double getStarPrice() {
+ return starPrice;
+ }
+
+ public void setStarPrice(double starPrice) {
+ this.starPrice = starPrice;
+ }
+
+ public double getDeliveryPrice() {
+ return deliveryPrice;
+ }
+
+ public void setDeliveryPrice(double deliveryPrice) {
+ this.deliveryPrice = deliveryPrice;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public List getFoodList() {
+ return foodList;
+ }
+
+ public void setFoodList(List foodList) {
+ this.foodList = foodList;
+ }
+}
diff --git a/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/Collect.java b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/Collect.java
new file mode 100644
index 0000000..9021e44
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/Collect.java
@@ -0,0 +1,46 @@
+package com.neusoft.po;
+
+/**
+ * @author qq
+ * @version 1.0
+ */
+public class Collect {
+ private Integer collectId;
+ private Integer businessId;
+ private String userId;
+
+
+ private Business business;
+
+ public Integer getCollectId() {
+ return collectId;
+ }
+
+ public void setCollectId(Integer collectId) {
+ this.collectId = collectId;
+ }
+
+ public Integer getBusinessId() {
+ return businessId;
+ }
+
+ public void setBusinessId(Integer businessId) {
+ this.businessId = businessId;
+ }
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public Business getBusiness() {
+ return business;
+ }
+
+ public void setBusiness(Business business) {
+ this.business = business;
+ }
+}
diff --git a/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/CommonResult.java b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/CommonResult.java
new file mode 100644
index 0000000..f80f8ec
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/CommonResult.java
@@ -0,0 +1,45 @@
+package com.neusoft.po;
+
+import java.io.Serializable;
+
+/**
+ * @author qq
+ * @version 1.0
+ */
+public class CommonResult implements Serializable {
+ private Integer code;
+ private String message;
+ private T result;
+
+ public CommonResult() {}
+
+ public CommonResult(Integer code, String message, T result) {
+ this.code = code;
+ this.message = message;
+ this.result = result;
+ }
+
+ public Integer getCode() {
+ return code;
+ }
+
+ public void setCode(Integer code) {
+ this.code = code;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public T getResult() {
+ return result;
+ }
+
+ public void setResult(T result) {
+ this.result = result;
+ }
+}
diff --git a/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/service/CollectService.java b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/service/CollectService.java
new file mode 100644
index 0000000..9e085f1
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/service/CollectService.java
@@ -0,0 +1,22 @@
+package com.neusoft.service;
+
+import com.neusoft.po.Business;
+import com.neusoft.po.Collect;
+
+import java.util.List;
+
+/**
+ * @author qq
+ * @version 1.0
+ */
+public interface CollectService {
+ public List getCollectList(Collect collect);
+
+ public Integer addCollect(Collect collect);
+
+ public Integer deleteCollect(Collect collect);
+
+ public Integer updateCollect(Collect collect);
+
+
+}
diff --git a/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/service/impl/CollectServiceImpl.java b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/service/impl/CollectServiceImpl.java
new file mode 100644
index 0000000..bef811a
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/service/impl/CollectServiceImpl.java
@@ -0,0 +1,39 @@
+package com.neusoft.service.impl;
+
+import com.neusoft.mapper.CollectMapper;
+import com.neusoft.po.Collect;
+import com.neusoft.service.CollectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author qq
+ * @version 1.0
+ */
+@Service
+public class CollectServiceImpl implements CollectService {
+ @Autowired
+ private CollectMapper collectMapper;
+
+ @Override
+ public List getCollectList(Collect collect) {
+ return collectMapper.listCollect(collect);
+ }
+
+ @Override
+ public Integer addCollect(Collect collect) {
+ return collectMapper.insertCollect(collect);
+ }
+
+ @Override
+ public Integer deleteCollect(Collect collect) {
+ return collectMapper.deleteCollectById(collect);
+ }
+
+ @Override
+ public Integer updateCollect(Collect collect) {
+ return collectMapper.updateCollectById(collect);
+ }
+}
diff --git a/springcloud_elm/collect_server_10800/src/main/resources/bootstrap.yml b/springcloud_elm/collect_server_10800/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..2849943
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/resources/bootstrap.yml
@@ -0,0 +1,19 @@
+spring:
+ cloud:
+ config:
+ name: collect_server_10800
+ profile: dev
+ label: master
+ discovery:
+ enabled: true
+ service-id: config-server
+
+eureka:
+ client:
+ service-url:
+ defaultZone: http://eurekaServer13000:13000/eureka/,http://eurekaServer13001:13001/eureka/
+ instance:
+ prefer-ip-address: true #使用ip地址向eureka server进行注册
+ instance-id: ${spring.cloud.client.ip-address}:${server.port} #设置eureka控制台中显示的注册信息
+ lease-renewal-interval-in-seconds: 5
+ lease-expiration-duration-in-seconds: 15
\ No newline at end of file
diff --git a/springcloud_elm/collect_server_10800/src/main/resources/mapper/CollectMapper.xml b/springcloud_elm/collect_server_10800/src/main/resources/mapper/CollectMapper.xml
new file mode 100644
index 0000000..799cb58
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/resources/mapper/CollectMapper.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ delete from collect
+
+ userId=#{userId} and businessId=#{businessId}
+
+
+
\ No newline at end of file
diff --git a/springcloud_elm/collect_server_10800/target/classes/bootstrap.yml b/springcloud_elm/collect_server_10800/target/classes/bootstrap.yml
new file mode 100644
index 0000000..2849943
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/target/classes/bootstrap.yml
@@ -0,0 +1,19 @@
+spring:
+ cloud:
+ config:
+ name: collect_server_10800
+ profile: dev
+ label: master
+ discovery:
+ enabled: true
+ service-id: config-server
+
+eureka:
+ client:
+ service-url:
+ defaultZone: http://eurekaServer13000:13000/eureka/,http://eurekaServer13001:13001/eureka/
+ instance:
+ prefer-ip-address: true #使用ip地址向eureka server进行注册
+ instance-id: ${spring.cloud.client.ip-address}:${server.port} #设置eureka控制台中显示的注册信息
+ lease-renewal-interval-in-seconds: 5
+ lease-expiration-duration-in-seconds: 15
\ No newline at end of file
diff --git a/springcloud_elm/collect_server_10800/target/classes/mapper/CollectMapper.xml b/springcloud_elm/collect_server_10800/target/classes/mapper/CollectMapper.xml
new file mode 100644
index 0000000..799cb58
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/target/classes/mapper/CollectMapper.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ delete from collect
+
+ userId=#{userId} and businessId=#{businessId}
+
+
+
\ No newline at end of file
diff --git a/springcloud_elm/gateway_server_14000/src/main/resources/application.yml b/springcloud_elm/gateway_server_14000/src/main/resources/application.yml
index 0b72282..5627e5c 100644
--- a/springcloud_elm/gateway_server_14000/src/main/resources/application.yml
+++ b/springcloud_elm/gateway_server_14000/src/main/resources/application.yml
@@ -16,6 +16,7 @@ spring:
- POST
- PUT
- DELETE
+ - PATCH
default-filters:
- name: Hystrix
args:
@@ -67,6 +68,11 @@ spring:
predicates:
- Path=/CouponController/*/**
+ - id: collectServer
+ uri: lb://collect-server
+ predicates:
+ - Path=/CollectController/*/**
+
eureka:
client:
service-url:
diff --git a/springcloud_elm/gateway_server_14000/target/classes/application.yml b/springcloud_elm/gateway_server_14000/target/classes/application.yml
index 0b72282..5627e5c 100644
--- a/springcloud_elm/gateway_server_14000/target/classes/application.yml
+++ b/springcloud_elm/gateway_server_14000/target/classes/application.yml
@@ -16,6 +16,7 @@ spring:
- POST
- PUT
- DELETE
+ - PATCH
default-filters:
- name: Hystrix
args:
@@ -67,6 +68,11 @@ spring:
predicates:
- Path=/CouponController/*/**
+ - id: collectServer
+ uri: lb://collect-server
+ predicates:
+ - Path=/CollectController/*/**
+
eureka:
client:
service-url:
diff --git a/springcloud_elm/orders_server_10600/.classpath b/springcloud_elm/orders_server_10600/.classpath
new file mode 100644
index 0000000..653dfd7
--- /dev/null
+++ b/springcloud_elm/orders_server_10600/.classpath
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/springcloud_elm/orders_server_10600/.project b/springcloud_elm/orders_server_10600/.project
new file mode 100644
index 0000000..dd1e5bd
--- /dev/null
+++ b/springcloud_elm/orders_server_10600/.project
@@ -0,0 +1,28 @@
+
+
+ orders_server_10600
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.springframework.ide.eclipse.boot.validation.springbootbuilder
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+ org.eclipse.m2e.core.maven2Nature
+
+
diff --git a/springcloud_elm/orders_server_10600/.settings/org.eclipse.core.resources.prefs b/springcloud_elm/orders_server_10600/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..abdea9a
--- /dev/null
+++ b/springcloud_elm/orders_server_10600/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding/=UTF-8
diff --git a/springcloud_elm/orders_server_10600/.settings/org.eclipse.jdt.apt.core.prefs b/springcloud_elm/orders_server_10600/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 0000000..d4313d4
--- /dev/null
+++ b/springcloud_elm/orders_server_10600/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/springcloud_elm/orders_server_10600/.settings/org.eclipse.jdt.core.prefs b/springcloud_elm/orders_server_10600/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..1b6e1ef
--- /dev/null
+++ b/springcloud_elm/orders_server_10600/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,9 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/springcloud_elm/orders_server_10600/.settings/org.springframework.ide.eclipse.prefs b/springcloud_elm/orders_server_10600/.settings/org.springframework.ide.eclipse.prefs
new file mode 100644
index 0000000..a12794d
--- /dev/null
+++ b/springcloud_elm/orders_server_10600/.settings/org.springframework.ide.eclipse.prefs
@@ -0,0 +1,2 @@
+boot.validation.initialized=true
+eclipse.preferences.version=1
diff --git a/springcloud_elm/orders_server_10600/src/main/java/com/neusoft/controller/OrdersController.java b/springcloud_elm/orders_server_10600/src/main/java/com/neusoft/controller/OrdersController.java
index 8563cae..a77cf6f 100644
--- a/springcloud_elm/orders_server_10600/src/main/java/com/neusoft/controller/OrdersController.java
+++ b/springcloud_elm/orders_server_10600/src/main/java/com/neusoft/controller/OrdersController.java
@@ -47,9 +47,11 @@ public class OrdersController {
@PutMapping("/Orders/{orderId}")
public CommonResultpayOrdersById(@PathVariable("orderId") Integer orderId)throws Exception
{
- int result=ordersService.payOrdersById(orderId, null, null, null);
- return new CommonResult<>(200,"success",result);
+ int result=ordersService.payOrdersById(orderId, null, null, null);
+ return new CommonResult<>(200,"success",result);
}
+
+
// @PutMapping("/Orders")
// public int payOrdersById(OrderState orderState, @RequestHeader("Authorization") String token) throws Exception {
// return ordersService.payOrdersById(orderState.getOrderId(), orderState.getUserId(), orderState.getOrderTotal(), orderState.getReduction(),token);
diff --git a/springcloud_elm/orders_server_10601/.classpath b/springcloud_elm/orders_server_10601/.classpath
new file mode 100644
index 0000000..653dfd7
--- /dev/null
+++ b/springcloud_elm/orders_server_10601/.classpath
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/springcloud_elm/orders_server_10601/.project b/springcloud_elm/orders_server_10601/.project
new file mode 100644
index 0000000..0d3f6a0
--- /dev/null
+++ b/springcloud_elm/orders_server_10601/.project
@@ -0,0 +1,28 @@
+
+
+ orders_server_10601
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.springframework.ide.eclipse.boot.validation.springbootbuilder
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+ org.eclipse.m2e.core.maven2Nature
+
+
diff --git a/springcloud_elm/orders_server_10601/.settings/org.eclipse.core.resources.prefs b/springcloud_elm/orders_server_10601/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..abdea9a
--- /dev/null
+++ b/springcloud_elm/orders_server_10601/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding/=UTF-8
diff --git a/springcloud_elm/orders_server_10601/.settings/org.eclipse.jdt.apt.core.prefs b/springcloud_elm/orders_server_10601/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 0000000..d4313d4
--- /dev/null
+++ b/springcloud_elm/orders_server_10601/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/springcloud_elm/orders_server_10601/.settings/org.eclipse.jdt.core.prefs b/springcloud_elm/orders_server_10601/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..1b6e1ef
--- /dev/null
+++ b/springcloud_elm/orders_server_10601/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,9 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/springcloud_elm/orders_server_10601/.settings/org.springframework.ide.eclipse.prefs b/springcloud_elm/orders_server_10601/.settings/org.springframework.ide.eclipse.prefs
new file mode 100644
index 0000000..a12794d
--- /dev/null
+++ b/springcloud_elm/orders_server_10601/.settings/org.springframework.ide.eclipse.prefs
@@ -0,0 +1,2 @@
+boot.validation.initialized=true
+eclipse.preferences.version=1
diff --git a/springcloud_elm/pom.xml b/springcloud_elm/pom.xml
index 87def86..9e966c8 100644
--- a/springcloud_elm/pom.xml
+++ b/springcloud_elm/pom.xml
@@ -26,6 +26,7 @@
search_server_11600
point_server_10900
coupon_server_10950
+ collect_server_10800
pom
diff --git a/springcloud_elm/search_server_11600/src/main/java/com/neusoft/service/impl/SearchServiceImpl.java b/springcloud_elm/search_server_11600/src/main/java/com/neusoft/service/impl/SearchServiceImpl.java
index 76d51bd..b612ead 100644
--- a/springcloud_elm/search_server_11600/src/main/java/com/neusoft/service/impl/SearchServiceImpl.java
+++ b/springcloud_elm/search_server_11600/src/main/java/com/neusoft/service/impl/SearchServiceImpl.java
@@ -38,7 +38,9 @@ public class SearchServiceImpl implements SearchService {
Result res = ToAnalysis.parse(query);
List keywords=new ArrayList<>();
for(Term term:res){
- keywords.add(term.getName());
+ if(!term.getName().matches("^\\s+$")){
+ keywords.add(term.getName());
+ }
}
return businessMapper.listBusinessByKeyword(keywords);
}