改造项目为cloud k8s

去除mangodb

abi-cloud-qr-platform-server/pom.xml

@@ -36,14 +36,6 @@
         </dependency>
 
         <!-- 其他微服务api -->
-<!--        <dependency>-->
-<!--            <groupId>com.abi.bees.user</groupId>-->
-<!--            <artifactId>user-context-starter</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.abi.bees</groupId>-->
-<!--            <artifactId>business-entity-api</artifactId>-->
-<!--        </dependency>-->
 
         <!-- 外部jar包 -->
         <dependency>
@@ -96,11 +88,10 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-boot-starter</artifactId>
         </dependency>
-        <!-- 给鼎昌开发，暂时不使用k8s做注册中心 -->
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-kubernetes-all</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-kubernetes-all</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
@@ -139,12 +130,6 @@
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
 
-        <!-- mongodb -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-mongodb</artifactId>
-        </dependency>
-
         <!-- redisson -->
         <dependency>
             <groupId>org.redisson</groupId>

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/QrData.java

@@ -3,7 +3,6 @@ package com.abi.qms.platform.dao.entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -22,7 +21,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@Document(collection = "qr_data")
+//@Document(collection = "qr_data")
 public class QrData implements Serializable {
 
 	/** MongoDB主键 */

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/QrDataService.java

@@ -2,8 +2,6 @@ package com.abi.qms.platform.service;
 
 import com.abi.qms.platform.dao.entity.QrData;
 import com.abi.qms.platform.dto.req.ImportQrDataReq;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 
 import java.util.List;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrDataServiceImpl.java

@@ -20,9 +20,6 @@ import com.abi.task.common.api.exception.BusinessException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -45,8 +42,8 @@ import java.util.List;
 @Slf4j
 public class QrDataServiceImpl implements QrDataService {
 
-	@Autowired
-	private MongoTemplate mongoTemplate;
+//	@Autowired
+//	private MongoTemplate mongoTemplate;
 
 	@Autowired
 	private QrPackageMapper qrPackageMapper;
@@ -60,28 +57,33 @@ public class QrDataServiceImpl implements QrDataService {
 	/**
 	 * 根据批次号查询码数量
 	 */
+	@Override
 	public long selectCountByBatchNumber(String batchNumber) {
-		Query query = new Query();
-		query.addCriteria(Criteria.where("batchNumber").is(batchNumber));
-		return mongoTemplate.count(query, QrData.class);
+//		Query query = new Query();
+//		query.addCriteria(Criteria.where("batchNumber").is(batchNumber));
+//		return mongoTemplate.count(query, QrData.class);
+		return 0L;
 	}
 
 	/**
 	 * 根据批次号删除码
 	 */
+	@Override
 	public void deleteCodeByBatchNumber(String batchNumber) {
-		Query query = new Query();
-		query.addCriteria(Criteria.where("batchNumber").is(batchNumber));
-		mongoTemplate.remove(query, QrData.class);
+//		Query query = new Query();
+//		query.addCriteria(Criteria.where("batchNumber").is(batchNumber));
+//		mongoTemplate.remove(query, QrData.class);
 	}
 
 	/**
 	 * 根据批次号查询码
 	 */
+	@Override
 	public List<QrData> selectCodeByBatch(String batchNumber) {
-		Query query = new Query();
-		query.addCriteria(Criteria.where("batchNumber").is(batchNumber));
-		return mongoTemplate.find(query, QrData.class);
+//		Query query = new Query();
+//		query.addCriteria(Criteria.where("batchNumber").is(batchNumber));
+//		return mongoTemplate.find(query, QrData.class);
+		return null;
 	}
 
 	/**
@@ -89,7 +91,7 @@ public class QrDataServiceImpl implements QrDataService {
 	 */
 	@Override
 	public void batchInsert(List<QrData> qrDataList) {
-		mongoTemplate.insert(qrDataList, QrData.class);
+//		mongoTemplate.insert(qrDataList, QrData.class);
 	}
 
 	/**

abi-cloud-qr-platform-server/src/main/resources/application.yml

@@ -23,32 +23,20 @@ spring:
       max-request-size: 40MB
   datasource:
     driver-class-name: org.mariadb.jdbc.Driver
-    #后续改回k8s做配置中心就要删除这里的代码
-    username: qmsqrdev
-    url: jdbc:mysql://rm-uf6t3m8yo40d5b905go.mysql.rds.aliyuncs.com:3306/qms_qr_platform_dev?characterEncoding=utf8&serverTimezone=Asia/Shanghai
-    password: qmsqrdev@2021
-  redis:
-    database: 0
-    password: Abi@12345
-    host: r-uf6kxuqc1iw6f8rwrjpd.redis.rds.aliyuncs.com
-  rabbitmq:
-    host: 192.168.2.53
-    port: 5672
-    username: guest
-    password: guest
-    # 启用发布确认
-    publisher-confirm-type: correlated
-    listener:
-      simple:
-        # 消息确认方式：手动
-        acknowledge-mode: manual
-        concurrency: 1
-        max-concurrency: 5
-  data:
-    mongodb:
-      host: 192.168.2.54
-      port: 27017
-      database: qr
+
+#    rabbitmq:
+#      host: 192.168.2.53
+#      port: 5672
+#      username: guest
+#      password: guest
+#      # 启用发布确认
+#      publisher-confirm-type: correlated
+#      listener:
+#        simple:
+#          # 消息确认方式：手动
+#          acknowledge-mode: manual
+#          concurrency: 1
+#          max-concurrency: 5
 
 management:
   endpoint:

abi-cloud-qr-platform-server/src/main/resources/bootstrap.yml

@@ -6,32 +6,32 @@ spring:
   main:
     allow-bean-definition-overriding: true
   cloud:
-#    kubernetes:
-#      discovery:
-#        all-namespaces: true
-#        service-name: ${spring.application.name}
-#      config:
-#        enabled: true
-#        name: qms-qr-platform-service-config
-#        namespace: ${spring.profiles.active}
-#      secrets:
-#        enabled: true
-#        enable-api: true
-#        namespace: ${spring.profiles.active}
-#        sources:
-#        - name: redis
-#        - name: rabbitmq
-#        - name: qms-qr-platform-service-secret
-#      reload:
-#        enabled: true
-#        monitoring-config-maps: true
-#        monitoring-secrets: true
-#        strategy: RESTART_CONTEXT
-#        mode: EVENT
-#      client:
-#        namespace: ${spring.profiles.active}
-#        username: LTAI4G1MSbqvMebsQdMvtxcD
-#        password: ew9VUPCOxjgNZ3A4xQ2RXpYDNyUXFf
+    kubernetes:
+      discovery:
+        all-namespaces: true
+        service-name: ${spring.application.name}
+      config:
+        enabled: true
+        name: qms-qr-platform-service-config
+        namespace: ${spring.profiles.active}
+      secrets:
+        enabled: true
+        enable-api: true
+        namespace: ${spring.profiles.active}
+        sources:
+        - name: redis
+        - name: rabbitmq
+        - name: qms-qr-platform-service-secret
+      reload:
+        enabled: true
+        monitoring-config-maps: true
+        monitoring-secrets: true
+        strategy: RESTART_CONTEXT
+        mode: EVENT
+      client:
+        namespace: ${spring.profiles.active}
+        username: LTAI4G1MSbqvMebsQdMvtxcD
+        password: ew9VUPCOxjgNZ3A4xQ2RXpYDNyUXFf
     loadbalancer:
       ribbon:
         enabled: false

abi-cloud-qr-platform-server/src/test/java/com/abi/qms/platform/GenerateCodeTest.java

@@ -10,7 +10,6 @@ import org.junit.jupiter.api.Test;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.mongodb.core.MongoTemplate;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,8 +29,8 @@ public class GenerateCodeTest {
 	@Autowired
 	private QrPackageMapper qrPackageMapper;
 
-	@Autowired
-	private MongoTemplate mongoTemplate;
+//	@Autowired
+//	private MongoTemplate mongoTemplate;
 
 	@Test
 	public void generateCodeTest() {
@@ -46,7 +45,7 @@ public class GenerateCodeTest {
 		innerDataList.add(new QrInnerData().setCode("123456"));
 		innerDataList.add(new QrInnerData().setCode("123456"));
 		qrData.setInnerDataList(innerDataList);
-		mongoTemplate.insert(qrData);
+//		mongoTemplate.insert(qrData);
 	}
 
 	@Test
@@ -67,6 +66,6 @@ public class GenerateCodeTest {
 		qrData.setInnerDataList(innerDataList);
 		qrDataList.add(qrData);
 
-		mongoTemplate.insert(qrDataList, QrData.class);
+//		mongoTemplate.insert(qrDataList, QrData.class);
 	}
 }

pom.xml

@@ -23,8 +23,6 @@
     </parent>
 
     <properties>
-        <!--<user.context.starter.version>1.2.0-SNAPSHOT</user.context.starter.version>-->
-
         <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
         <spring-cloud-kubernetes.version>1.1.7.RELEASE</spring-cloud-kubernetes.version>
 
@@ -52,21 +50,17 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- user的token获取starter
+            <!-- 其他能力中心jar包 -->
             <dependency>
-                <groupId>com.abi.bees.user</groupId>
-                <artifactId>user-context-starter</artifactId>
-                <version>${user.context.starter.version}</version>
+                <groupId>com.abi.sms</groupId>
+                <artifactId>sms-center-client</artifactId>
+                <version>1.0-SNAPSHOT</version>
             </dependency>
-            -->
-
-            <!-- 其他能力中心jar包
             <dependency>
                 <groupId>com.abi.bees</groupId>
-                <artifactId>business-entity-api</artifactId>
-                <version>1.4-SNAPSHOT</version>
+                <artifactId>sms-center-api</artifactId>
+                <version>1.0.0</version>
             </dependency>
-            -->
 
             <!-- 开源软件jar包 -->
             <dependency>
@@ -76,14 +70,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <!-- 给鼎昌开发，暂时不使用k8s做注册中心 -->
-<!--            <dependency>-->
-<!--                <groupId>org.springframework.cloud</groupId>-->
-<!--                <artifactId>spring-cloud-kubernetes-dependencies</artifactId>-->
-<!--                <version>${spring-cloud-kubernetes.version}</version>-->
-<!--                <type>pom</type>-->
-<!--                <scope>import</scope>-->
-<!--            </dependency>-->
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-kubernetes-dependencies</artifactId>
+                <version>${spring-cloud-kubernetes.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>io.springfox</groupId>
                 <artifactId>springfox-boot-starter</artifactId>