💚 feat ci cd

.devops/未命名项目.yml

@@ -0,0 +1,98 @@
+version: 2
+name: 未命名项目
+description: ""
+global:
+  concurrent: 1
+  param:
+    - ref: deploy_path
+      name: deploy_path
+      value: '"pcm-kubernetes.yaml"'
+      required: false
+      type: STRING
+      hidden: false
+    - ref: secret_name
+      name: ""
+      value: '"jcce-aliyuncs"'
+      required: false
+      type: STRING
+      hidden: false
+    - ref: project_name
+      name: ""
+      value: '"jcce-market"'
+      required: false
+      type: STRING
+      hidden: false
+trigger:
+  webhook: gitlink@1.0.0
+  event:
+    - ref: create_tag
+      ruleset:
+        - param-ref: tag
+          operator: EQ
+          value: '""'
+      ruleset-operator: AND
+workflow:
+  - ref: start
+    name: 开始
+    task: start
+  - ref: git_clone_0
+    name: git clone
+    task: git_clone@1.2.6
+    input:
+      remote_url: '"https://gitlink.org.cn/jcce-pcm/jcce-market.git"'
+      ref: '"refs/heads/master"'
+      commit_id: '""'
+      depth: 1
+    needs:
+      - start
+  - ref: docker_image_build_0
+    name: docker镜像构建
+    task: docker_image_build@1.6.0
+    input:
+      docker_username: ((dev.docker_user))
+      docker_password: ((dev.docker_password))
+      image_name: '"registry.cn-hangzhou.aliyuncs.com/jcce/jcce-market"'
+      image_tag: git_clone_0.commit_time
+      registry_address: '"registry.cn-hangzhou.aliyuncs.com"'
+      docker_build_path: git_clone_0.git_path
+      workspace: git_clone_0.git_path
+      image_clean: true
+      image_push: true
+      build_args: '""'
+    needs:
+      - shell_0
+  - ref: end
+    name: 结束
+    task: end
+    needs:
+      - kubectl_deploy_0
+  - ref: kubectl_deploy_0
+    name: kubectl部署资源
+    task: kubectl_deploy@1.1.0
+    input:
+      command: '"apply"'
+      resource_file_path: git_clone_0.git_path
+      certificate_authority_data: ((dev.k8s_cad))
+      server: '"https://119.45.100.73:6443"'
+      client_certificate_data: ((dev.k8s_ccd))
+      client_key_data: ((dev.k8s_ckd))
+      hosts: '""'
+    needs:
+      - docker_image_build_0
+  - ref: shell_0
+    name: shell
+    image: docker.jianmuhub.com/library/debian:buster-slim
+    env:
+      IMAGE_NAME: '"registry.cn-hangzhou.aliyuncs.com/jcce/jcce-market"'
+      IMAGE_TAG: git_clone_0.commit_time
+      SECRET_NAME: global.secret_name
+      PROJECT_NAME: global.project_name
+      PROJECT_PATH: git_clone_0.git_path
+    script:
+      - cd ${PROJECT_PATH}
+      - sed -i "s#image_name#${IMAGE_NAME}:${IMAGE_TAG}#" ${PROJECT_NAME}.yaml
+      - sed -i "s#secret_name#${SECRET_NAME}#" ${PROJECT_NAME}.yaml
+      - cat ${PROJECT_NAME}.yaml
+    needs:
+      - git_clone_0
+

.dockerignore

@@ -0,0 +1 @@
+target

Dockerfile

@@ -1,12 +1,21 @@
+FROM jcce/maven:3-alpine AS builder
+
+WORKDIR /app
+LABEL stage=javabuilder
+
+COPY pom.xml ./
+COPY src ./src
+RUN mvn clean install -Dmaven.test.skip=true
+
+
+
 FROM jcce/openjdk:8-alpine
 
-RUN mkdir -p /jcc-admin
+WORKDIR /app
 
-WORKDIR /jcc-admin
+ARG JAR_FILE=/app/target/jcc-market.jar
 
-ARG JAR_FILE=target/jcc-admin.jar
-
-COPY ${JAR_FILE} app.jar
+COPY --from=builder   ${JAR_FILE} app.jar
 
 EXPOSE 8015
 

jcce-market.yaml

@@ -0,0 +1,58 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: jcce-market-deployment
+  namespace: jcce-system
+  labels:
+    k8s-app: jcce-market
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      k8s-app: jcce-market
+  template:
+    metadata:
+      labels:
+        k8s-app: jcce-market
+    spec:
+      imagePullSecrets:
+        - name: secret_name
+      containers:
+        - name: jcce-market
+          # 指定Docker Hub中的镜像地址
+          image: image_name
+          ports:
+            - containerPort: 8015
+          env:
+            # 指定环境
+            - name: spring.profiles.active
+              value: test
+            # 指定时区
+            - name: TZ
+              value: Asia/Shanghai
+          volumeMounts:
+            - mountPath: /var/logs
+              name: log-volume
+      restartPolicy: Always
+      volumes:
+        - name: log-volume
+          hostPath:
+            path: /data/app/jcce-market/logs
+            type: DirectoryOrCreate
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: jcce-market-service
+  namespace: jcce-system
+spec:
+  type: ClusterIP
+  selector:
+    k8s-app: jcce-market
+  ports:
+    - name: http
+      protocol: TCP
+      port: 8015
+      targetPort: 8015

pom.xml

@@ -9,10 +9,10 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>net.jointcloud</groupId>
-	<artifactId>negotiation</artifactId>
+	<artifactId>jcc-market</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>jcc-negotiation</name>
-	<description>negotiation</description>
+	<name>jcc-market</name>
+	<description>market</description>
 	<properties>
 		<java.version>1.8</java.version>
 	</properties>

rest-test.http

@@ -1,20 +1,20 @@
 ### 分页查询所有系统镜像
-GET http://localhost:8015/image/pageList?page=10&size=7
+GET https://dev.jointcloud.net/apis/jcc-market/image/pageList?page=10&size=7
 
 ### 根据系统名称查询镜像
-GET http://localhost:8015/image/selectBySystemName?systemName=Debian
+GET https://dev.jointcloud.net/apis/jcc-market/image/selectBySystemName?systemName=Debian
 
 ### 查询所有系统名称列表
-GET http://localhost:8015/image/systemNameList
+GET https://dev.jointcloud.net/apis/jcc-market/image/systemNameList
 
 ### 分页查询计算服务列表
-GET http://localhost:8015/provide/pageList?page=1&size=3&computingResourceId=9
+GET https://dev.jointcloud.net/apis/jcc-market/provide/pageList?page=1&size=3&computingResourceId=9
 
 ### 根据id查询计算服务详情
-GET http://localhost:8015/provide/detail?id=1
+GET https://dev.jointcloud.net/apis/jcc-market/provide/detail?id=1
 
 ### 服务发布
-POST http://localhost:8015/provide/create
+POST https://dev.jointcloud.net/apis/jcc-market/provide/create
 Content-Type: application/json
 
 {
@@ -51,13 +51,13 @@ Content-Type: application/json
 }
 
 ### 根据id查询需求详细数据
-GET http://localhost:8015/consumer/detail?id=2
+GET https://dev.jointcloud.net/apis/jcc-market/consumer/detail?id=2
 
 ### 分页查询需求列表
-GET http://localhost:8015/consumer/pageList?page=1&size=10
+GET https://dev.jointcloud.net/apis/jcc-market/consumer/pageList?page=1&size=10
 
 ### 发布需求
-POST http://localhost:8015/consumer/create
+POST https://dev.jointcloud.net/apis/jcc-market/consumer/create
 Content-Type: application/json
 
 {
@@ -98,16 +98,20 @@ Content-Type: application/json
 }
 
 ### 根据字典id查询子项列表
-GET http://localhost:8015/sysDictItem/child/12
+GET https://dev.jointcloud.net/apis/jcc-market/sysDictItem/child/12
 
 ### 查询计算中心字典项
-GET http://localhost:8015/sysDictItem/computingCenter
+GET https://dev.jointcloud.net/apis/jcc-market/sysDictItem/computingCenter
 
 ### 查询计算资源字典项
-GET http://localhost:8015/sysDictItem/computingResource
+GET https://dev.jointcloud.net/apis/jcc-market/sysDictItem/computingResource
 
 ### 查询算力卡类型字典项
-GET http://localhost:8015/sysDictItem/computingCardType
+GET https://dev.jointcloud.net/apis/jcc-market/sysDictItem/computingCardType
 
 ### 根据需求id,查询计算服务推荐列表
-GET http://localhost:8015/consumer/recommend?consumerId=1
+GET https://dev.jointcloud.net/apis/jcc-market/consumer/recommend?consumerId=1
+
+
+### 根据需求id,查询计算服务推荐列表
+GET https://dev.jointcloud.net/apis/jcc-market/consumer/recommend?consumerId=1

src/main/java/net/jointcloud/market/CodeGeneratorNew.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation;
+package net.jointcloud.market;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.generator.FastAutoGenerator;
@@ -23,7 +23,7 @@ public class CodeGeneratorNew {
                 })
                 // 包配置
                 .packageConfig(builder -> {
-                    builder.parent("net.jointcloud.negotiation") // 设置父包名
+                    builder.parent("net.jointcloud.market") // 设置父包名
                             .pathInfo(Collections.singletonMap(OutputFile.xml, System.getProperty("user.dir") + "/src/main/resources/mapper")); // 设置mapperXml生成路径
                 })
 

src/main/java/net/jointcloud/market/MarketApplication.java

@@ -1,15 +1,15 @@
-package net.jointcloud.negotiation;
+package net.jointcloud.market;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-@MapperScan("net.jointcloud.negotiation.mapper")
-public class NegotiationApplication {
+@MapperScan("net.jointcloud.market.mapper")
+public class MarketApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(NegotiationApplication.class, args);
+		SpringApplication.run(MarketApplication.class, args);
 	}
 
 }

src/main/java/net/jointcloud/market/MyMetaObjectHandler.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation;
+package net.jointcloud.market;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import lombok.extern.slf4j.Slf4j;
@@ -6,7 +6,6 @@ import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 @Slf4j
 @Component // 一定不要忘记把处理器加到IOC容器中！

src/main/java/net/jointcloud/market/config/MyBatisPlusConfig.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.config;
+package net.jointcloud.market.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;

src/main/java/net/jointcloud/market/config/constant/Constant.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.config.constant;
+package net.jointcloud.market.config.constant;
 
 
 /**

src/main/java/net/jointcloud/market/config/constant/ResultCode.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.config.constant;
+package net.jointcloud.market.config.constant;
 
 /**
  * @author jointcloud

src/main/java/net/jointcloud/market/controller/ConsumerController.java

@@ -1,15 +1,15 @@
-package net.jointcloud.negotiation.controller;
+package net.jointcloud.market.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import net.jointcloud.negotiation.domain.dto.ConsumerDto;
-import net.jointcloud.negotiation.domain.dto.ConsumerReq;
-import net.jointcloud.negotiation.domain.entity.ConsumerEntity;
-import net.jointcloud.negotiation.domain.vo.CommonPage;
-import net.jointcloud.negotiation.domain.vo.ConsumerVo;
-import net.jointcloud.negotiation.domain.vo.ProvideVo;
-import net.jointcloud.negotiation.domain.vo.Result;
-import net.jointcloud.negotiation.service.ConsumerService;
+import net.jointcloud.market.domain.dto.ConsumerDto;
+import net.jointcloud.market.domain.dto.ConsumerReq;
+import net.jointcloud.market.domain.entity.ConsumerEntity;
+import net.jointcloud.market.domain.vo.CommonPage;
+import net.jointcloud.market.domain.vo.ConsumerVo;
+import net.jointcloud.market.domain.vo.ProvideVo;
+import net.jointcloud.market.domain.vo.Result;
+import net.jointcloud.market.service.ConsumerService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

src/main/java/net/jointcloud/market/controller/ImageController.java

@@ -1,12 +1,12 @@
-package net.jointcloud.negotiation.controller;
+package net.jointcloud.market.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import net.jointcloud.negotiation.domain.entity.ImageEntity;
-import net.jointcloud.negotiation.domain.vo.CommonPage;
-import net.jointcloud.negotiation.domain.vo.Result;
-import net.jointcloud.negotiation.service.ImageService;
+import net.jointcloud.market.domain.entity.ImageEntity;
+import net.jointcloud.market.domain.vo.CommonPage;
+import net.jointcloud.market.domain.vo.Result;
+import net.jointcloud.market.service.ImageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/net/jointcloud/market/controller/ProvideController.java

@@ -1,15 +1,14 @@
-package net.jointcloud.negotiation.controller;
+package net.jointcloud.market.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import net.jointcloud.negotiation.domain.dto.ProvideDto;
-import net.jointcloud.negotiation.domain.dto.ProvideReq;
-import net.jointcloud.negotiation.domain.entity.ProvideEntity;
-import net.jointcloud.negotiation.domain.vo.CommonPage;
-import net.jointcloud.negotiation.domain.vo.ProvideVo;
-import net.jointcloud.negotiation.domain.vo.Result;
-import net.jointcloud.negotiation.mapper.ProvideMapper;
-import net.jointcloud.negotiation.service.ProvideService;
+import net.jointcloud.market.domain.dto.ProvideDto;
+import net.jointcloud.market.domain.dto.ProvideReq;
+import net.jointcloud.market.domain.entity.ProvideEntity;
+import net.jointcloud.market.domain.vo.CommonPage;
+import net.jointcloud.market.domain.vo.ProvideVo;
+import net.jointcloud.market.domain.vo.Result;
+import net.jointcloud.market.service.ProvideService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

src/main/java/net/jointcloud/market/controller/SysDictController.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.controller;
+package net.jointcloud.market.controller;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/net/jointcloud/market/controller/SysDictItemController.java

@@ -1,8 +1,8 @@
-package net.jointcloud.negotiation.controller;
+package net.jointcloud.market.controller;
 
-import net.jointcloud.negotiation.domain.entity.SysDictItemEntity;
-import net.jointcloud.negotiation.domain.vo.Result;
-import net.jointcloud.negotiation.service.SysDictItemService;
+import net.jointcloud.market.domain.entity.SysDictItemEntity;
+import net.jointcloud.market.domain.vo.Result;
+import net.jointcloud.market.service.SysDictItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

src/main/java/net/jointcloud/market/domain/dto/ConsumerDto.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.domain.dto;
+package net.jointcloud.market.domain.dto;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

src/main/java/net/jointcloud/market/domain/dto/ConsumerReq.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.domain.dto;
+package net.jointcloud.market.domain.dto;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

src/main/java/net/jointcloud/market/domain/dto/ProvideDto.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.domain.dto;
+package net.jointcloud.market.domain.dto;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

src/main/java/net/jointcloud/market/domain/dto/ProvideReq.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.domain.dto;
+package net.jointcloud.market.domain.dto;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

src/main/java/net/jointcloud/market/domain/dto/RecommendDto.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.domain.dto;
+package net.jointcloud.market.domain.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/net/jointcloud/market/domain/entity/ConsumerEntity.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.domain.entity;
+package net.jointcloud.market.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;

src/main/java/net/jointcloud/market/domain/entity/ImageEntity.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.domain.entity;
+package net.jointcloud.market.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

src/main/java/net/jointcloud/market/domain/entity/ProvideEntity.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.domain.entity;
+package net.jointcloud.market.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

src/main/java/net/jointcloud/market/domain/entity/SysDictEntity.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.domain.entity;
+package net.jointcloud.market.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;

src/main/java/net/jointcloud/market/domain/entity/SysDictItemEntity.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.domain.entity;
+package net.jointcloud.market.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;

src/main/java/net/jointcloud/market/domain/vo/CommonPage.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.domain.vo;
+package net.jointcloud.market.domain.vo;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;

src/main/java/net/jointcloud/market/domain/vo/ConsumerVo.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.domain.vo;
+package net.jointcloud.market.domain.vo;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

src/main/java/net/jointcloud/market/domain/vo/ProvideVo.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.domain.vo;
+package net.jointcloud.market.domain.vo;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

src/main/java/net/jointcloud/market/domain/vo/Result.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.domain.vo;
+package net.jointcloud.market.domain.vo;
 
 import org.springframework.http.HttpStatus;
 

src/main/java/net/jointcloud/market/exception/ApiException.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.exception;
+package net.jointcloud.market.exception;
 
 /**
  * 自定义API异常

src/main/java/net/jointcloud/market/exception/Asserts.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.exception;
+package net.jointcloud.market.exception;
 
 /**
  * 断言处理类，用于抛出各种API异常

src/main/java/net/jointcloud/market/exception/EntityExistsException.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.exception;
+package net.jointcloud.market.exception;
 
 /**
  * 

src/main/java/net/jointcloud/market/exception/EntityNotFoundException.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.exception;
+package net.jointcloud.market.exception;
 
 
 public class EntityNotFoundException extends RuntimeException {

src/main/java/net/jointcloud/market/exception/IErrorCode.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.exception;
+package net.jointcloud.market.exception;
 
 /**
  * 封装API的错误码

src/main/java/net/jointcloud/market/exception/OutOfBusinessException.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.exception;
+package net.jointcloud.market.exception;
 
 /**
  * 超出业务范围的异常

src/main/java/net/jointcloud/market/exception/ResponseResultBodyAdvice.java

@@ -1,6 +1,6 @@
-package net.jointcloud.negotiation.exception;
+package net.jointcloud.market.exception;
 
-import net.jointcloud.negotiation.domain.vo.Result;
+import net.jointcloud.market.domain.vo.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/net/jointcloud/market/mapper/ConsumerMapper.java

@@ -1,11 +1,11 @@
-package net.jointcloud.negotiation.mapper;
+package net.jointcloud.market.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import net.jointcloud.negotiation.domain.dto.ConsumerReq;
-import net.jointcloud.negotiation.domain.entity.ConsumerEntity;
-import net.jointcloud.negotiation.domain.vo.ConsumerVo;
+import net.jointcloud.market.domain.dto.ConsumerReq;
+import net.jointcloud.market.domain.entity.ConsumerEntity;
+import net.jointcloud.market.domain.vo.ConsumerVo;
 import org.apache.ibatis.annotations.Param;
 
 /**

src/main/java/net/jointcloud/market/mapper/ImageMapper.java

@@ -1,7 +1,7 @@
-package net.jointcloud.negotiation.mapper;
+package net.jointcloud.market.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import net.jointcloud.negotiation.domain.entity.ImageEntity;
+import net.jointcloud.market.domain.entity.ImageEntity;
 
 /**
  * <p>

src/main/java/net/jointcloud/market/mapper/ProvideMapper.java

@@ -1,11 +1,11 @@
-package net.jointcloud.negotiation.mapper;
+package net.jointcloud.market.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import net.jointcloud.negotiation.domain.dto.ProvideReq;
-import net.jointcloud.negotiation.domain.entity.ProvideEntity;
-import net.jointcloud.negotiation.domain.vo.ProvideVo;
+import net.jointcloud.market.domain.dto.ProvideReq;
+import net.jointcloud.market.domain.entity.ProvideEntity;
+import net.jointcloud.market.domain.vo.ProvideVo;
 import org.apache.ibatis.annotations.Param;
 
 /**

src/main/java/net/jointcloud/market/mapper/SysDictItemMapper.java

@@ -1,6 +1,6 @@
-package net.jointcloud.negotiation.mapper;
+package net.jointcloud.market.mapper;
 
-import net.jointcloud.negotiation.domain.entity.SysDictItemEntity;
+import net.jointcloud.market.domain.entity.SysDictItemEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;

src/main/java/net/jointcloud/market/mapper/SysDictMapper.java

@@ -1,6 +1,6 @@
-package net.jointcloud.negotiation.mapper;
+package net.jointcloud.market.mapper;
 
-import net.jointcloud.negotiation.domain.entity.SysDictEntity;
+import net.jointcloud.market.domain.entity.SysDictEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

src/main/java/net/jointcloud/market/service/ConsumerService.java

@@ -1,12 +1,12 @@
-package net.jointcloud.negotiation.service;
+package net.jointcloud.market.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import net.jointcloud.negotiation.domain.dto.ConsumerReq;
-import net.jointcloud.negotiation.domain.entity.ConsumerEntity;
-import net.jointcloud.negotiation.domain.vo.ConsumerVo;
-import net.jointcloud.negotiation.domain.vo.ProvideVo;
+import net.jointcloud.market.domain.dto.ConsumerReq;
+import net.jointcloud.market.domain.entity.ConsumerEntity;
+import net.jointcloud.market.domain.vo.ConsumerVo;
+import net.jointcloud.market.domain.vo.ProvideVo;
 
 /**
  * <p>

src/main/java/net/jointcloud/market/service/ImageService.java

@@ -1,10 +1,10 @@
-package net.jointcloud.negotiation.service;
+package net.jointcloud.market.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import net.jointcloud.negotiation.domain.entity.ImageEntity;
+import net.jointcloud.market.domain.entity.ImageEntity;
 
 import java.util.List;
 

src/main/java/net/jointcloud/market/service/ProvideService.java

@@ -1,11 +1,11 @@
-package net.jointcloud.negotiation.service;
+package net.jointcloud.market.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import net.jointcloud.negotiation.domain.dto.ProvideReq;
-import net.jointcloud.negotiation.domain.entity.ProvideEntity;
-import net.jointcloud.negotiation.domain.vo.ProvideVo;
+import net.jointcloud.market.domain.dto.ProvideReq;
+import net.jointcloud.market.domain.entity.ProvideEntity;
+import net.jointcloud.market.domain.vo.ProvideVo;
 
 /**
  * <p>

src/main/java/net/jointcloud/market/service/SysDictItemService.java

@@ -1,6 +1,6 @@
-package net.jointcloud.negotiation.service;
+package net.jointcloud.market.service;
 
-import net.jointcloud.negotiation.domain.entity.SysDictItemEntity;
+import net.jointcloud.market.domain.entity.SysDictItemEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;

src/main/java/net/jointcloud/market/service/SysDictService.java

@@ -1,6 +1,6 @@
-package net.jointcloud.negotiation.service;
+package net.jointcloud.market.service;
 
-import net.jointcloud.negotiation.domain.entity.SysDictEntity;
+import net.jointcloud.market.domain.entity.SysDictEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

src/main/java/net/jointcloud/market/service/impl/ConsumerServiceImpl.java

@@ -1,20 +1,20 @@
-package net.jointcloud.negotiation.service.impl;
+package net.jointcloud.market.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
-import net.jointcloud.negotiation.config.constant.ResultCode;
-import net.jointcloud.negotiation.domain.dto.ConsumerReq;
-import net.jointcloud.negotiation.domain.dto.ProvideReq;
-import net.jointcloud.negotiation.domain.dto.RecommendDto;
-import net.jointcloud.negotiation.domain.entity.ConsumerEntity;
-import net.jointcloud.negotiation.domain.vo.ConsumerVo;
-import net.jointcloud.negotiation.domain.vo.ProvideVo;
-import net.jointcloud.negotiation.exception.OutOfBusinessException;
-import net.jointcloud.negotiation.mapper.ConsumerMapper;
-import net.jointcloud.negotiation.mapper.ProvideMapper;
-import net.jointcloud.negotiation.service.ConsumerService;
+import net.jointcloud.market.config.constant.ResultCode;
+import net.jointcloud.market.domain.dto.ConsumerReq;
+import net.jointcloud.market.domain.dto.ProvideReq;
+import net.jointcloud.market.domain.dto.RecommendDto;
+import net.jointcloud.market.domain.entity.ConsumerEntity;
+import net.jointcloud.market.domain.vo.ConsumerVo;
+import net.jointcloud.market.domain.vo.ProvideVo;
+import net.jointcloud.market.exception.OutOfBusinessException;
+import net.jointcloud.market.mapper.ConsumerMapper;
+import net.jointcloud.market.mapper.ProvideMapper;
+import net.jointcloud.market.service.ConsumerService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/net/jointcloud/market/service/impl/ImageServiceImpl.java

@@ -1,4 +1,4 @@
-package net.jointcloud.negotiation.service.impl;
+package net.jointcloud.market.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import net.jointcloud.negotiation.domain.entity.ImageEntity;
-import net.jointcloud.negotiation.mapper.ImageMapper;
-import net.jointcloud.negotiation.service.ImageService;
+import net.jointcloud.market.domain.entity.ImageEntity;
+import net.jointcloud.market.mapper.ImageMapper;
+import net.jointcloud.market.service.ImageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/net/jointcloud/market/service/impl/ProvideServiceImpl.java

@@ -1,13 +1,13 @@
-package net.jointcloud.negotiation.service.impl;
+package net.jointcloud.market.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import net.jointcloud.negotiation.domain.dto.ProvideReq;
-import net.jointcloud.negotiation.domain.entity.ProvideEntity;
-import net.jointcloud.negotiation.domain.vo.ProvideVo;
-import net.jointcloud.negotiation.mapper.ProvideMapper;
-import net.jointcloud.negotiation.service.ProvideService;
+import net.jointcloud.market.domain.dto.ProvideReq;
+import net.jointcloud.market.domain.entity.ProvideEntity;
+import net.jointcloud.market.domain.vo.ProvideVo;
+import net.jointcloud.market.mapper.ProvideMapper;
+import net.jointcloud.market.service.ProvideService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/net/jointcloud/market/service/impl/SysDictItemServiceImpl.java

@@ -1,21 +1,17 @@
-package net.jointcloud.negotiation.service.impl;
+package net.jointcloud.market.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import net.jointcloud.negotiation.config.constant.Constant;
-import net.jointcloud.negotiation.domain.entity.ImageEntity;
-import net.jointcloud.negotiation.domain.entity.SysDictItemEntity;
-import net.jointcloud.negotiation.mapper.SysDictItemMapper;
-import net.jointcloud.negotiation.service.SysDictItemService;
+import net.jointcloud.market.config.constant.Constant;
+import net.jointcloud.market.domain.entity.SysDictItemEntity;
+import net.jointcloud.market.mapper.SysDictItemMapper;
+import net.jointcloud.market.service.SysDictItemService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.omg.CORBA.CODESET_INCOMPATIBLE;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
-import static net.jointcloud.negotiation.config.constant.Constant.COMPUTING_CENTER;
-
 /**
  * <p>
  *  服务实现类

src/main/java/net/jointcloud/market/service/impl/SysDictServiceImpl.java

@@ -1,8 +1,8 @@
-package net.jointcloud.negotiation.service.impl;
+package net.jointcloud.market.service.impl;
 
-import net.jointcloud.negotiation.domain.entity.SysDictEntity;
-import net.jointcloud.negotiation.mapper.SysDictMapper;
-import net.jointcloud.negotiation.service.SysDictService;
+import net.jointcloud.market.domain.entity.SysDictEntity;
+import net.jointcloud.market.mapper.SysDictMapper;
+import net.jointcloud.market.service.SysDictService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

src/main/resources/application.yml

@@ -8,13 +8,14 @@ spring:
       enabled: true
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.101.15.7:3306/shaoguan?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://10.206.0.12:3306/shaoguan?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: root
     password: uJpLd6u-J?HC1
   redis:
-    host: 127.0.0.1
+    host: 10.206.0.7
+    password: redisPW123
     database: 0
-    timeout: 5000ms
+    timeout: 5000ms # 连接超时时间（毫秒）
     lettuce:
       pool:
         max-active: 16
@@ -31,7 +32,7 @@ redis:
 
 logging:
   level:
-    net.jointcloud.negotiation: debug
+    net.jointcloud.market: debug
   config: classpath:logback-jcc.xml
   file:
     path: logs/@project.name@-@project.version@

src/main/resources/mapper/ConsumerMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.jointcloud.negotiation.mapper.ConsumerMapper">
+<mapper namespace="net.jointcloud.market.mapper.ConsumerMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="net.jointcloud.negotiation.domain.entity.ConsumerEntity">
+    <resultMap id="BaseResultMap" type="net.jointcloud.market.domain.entity.ConsumerEntity">
         <id column="id" property="id" />
         <result column="name" property="name" />
         <result column="domain" property="domain" />
@@ -37,7 +37,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
-    <resultMap id="ConsumerVoResultMap" type="net.jointcloud.negotiation.domain.vo.ConsumerVo" extends="BaseResultMap">
+    <resultMap id="ConsumerVoResultMap" type="net.jointcloud.market.domain.vo.ConsumerVo" extends="BaseResultMap">
         <result column="computingResourceName" jdbcType="VARCHAR" property="computingResourceName"/>
         <result column="computingCenterName" jdbcType="VARCHAR" property="computingCenterName"/>
         <result column="computingCardName" jdbcType="VARCHAR" property="computingCardName"/>
@@ -48,7 +48,7 @@
         id, name, domain, business, computing_resource_id, computing_card_id, compute_num, memory, vram, computing_center_id, charge_type, user_id, system_disk_category, system_disk_size, internet_max_bandwidth_out, image_type, image_id, amount, price_unit, duration_amount, type, description, docking_person, docking_phone, consumer_status, click_num, status, version, deleted, create_time, update_time
     </sql>
 
-    <select id="selectConsumerPage" parameterType="net.jointcloud.negotiation.domain.dto.ConsumerReq"
+    <select id="selectConsumerPage" parameterType="net.jointcloud.market.domain.dto.ConsumerReq"
             resultMap="ConsumerVoResultMap">
         select p.*,
         resource_item.item_text as computingResourceName,
@@ -72,7 +72,7 @@
         order by p.create_time desc
     </select>
 
-    <select id="queryById" resultType="net.jointcloud.negotiation.domain.vo.ConsumerVo">
+    <select id="queryById" resultType="net.jointcloud.market.domain.vo.ConsumerVo">
         select p.*,
                resource_item.item_text as computingResourceName,
                center_item.item_text as computingCenterName,

src/main/resources/mapper/ImageMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.jointcloud.negotiation.mapper.ImageMapper">
+<mapper namespace="net.jointcloud.market.mapper.ImageMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="net.jointcloud.negotiation.domain.entity.ImageEntity">
+    <resultMap id="BaseResultMap" type="net.jointcloud.market.domain.entity.ImageEntity">
         <id column="id" property="id" />
         <result column="image_id" property="imageId" />
         <result column="image_name" property="imageName" />

src/main/resources/mapper/ProvideMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.jointcloud.negotiation.mapper.ProvideMapper">
+<mapper namespace="net.jointcloud.market.mapper.ProvideMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="net.jointcloud.negotiation.domain.entity.ProvideEntity">
+    <resultMap id="BaseResultMap" type="net.jointcloud.market.domain.entity.ProvideEntity">
         <id column="id" property="id" />
         <result column="name" property="name" />
         <result column="domain" property="domain" />
@@ -33,7 +33,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
-    <resultMap id="ProvideVoResultMap" type="net.jointcloud.negotiation.domain.vo.ProvideVo" extends="BaseResultMap">
+    <resultMap id="ProvideVoResultMap" type="net.jointcloud.market.domain.vo.ProvideVo" extends="BaseResultMap">
         <result column="computingResourceName" jdbcType="VARCHAR" property="computingResourceName"/>
         <result column="computingCenterName" jdbcType="VARCHAR" property="computingCenterName"/>
         <result column="computingCardName" jdbcType="VARCHAR" property="computingCardName"/>
@@ -45,7 +45,7 @@
     </sql>
 
 
-    <select id="selectProvidePage" parameterType="net.jointcloud.negotiation.domain.dto.ProvideReq"
+    <select id="selectProvidePage" parameterType="net.jointcloud.market.domain.dto.ProvideReq"
             resultMap="ProvideVoResultMap">
         select p.*,
         resource_item.item_text as computingResourceName,
@@ -81,7 +81,7 @@
         where p.id =  #{id,jdbcType=VARCHAR}
     </select>
     
-    <select id="selectPriceFirst" parameterType="net.jointcloud.negotiation.domain.dto.ProvideReq"
+    <select id="selectPriceFirst" parameterType="net.jointcloud.market.domain.dto.ProvideReq"
             resultMap="ProvideVoResultMap">
         select p.*,
                resource_item.item_text as computingResourceName,

src/main/resources/mapper/SysDictItemMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.jointcloud.negotiation.mapper.SysDictItemMapper">
+<mapper namespace="net.jointcloud.market.mapper.SysDictItemMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="net.jointcloud.negotiation.domain.entity.SysDictItemEntity">
+    <resultMap id="BaseResultMap" type="net.jointcloud.market.domain.entity.SysDictItemEntity">
         <id column="id" property="id" />
         <result column="dict_id" property="dictId" />
         <result column="item_text" property="itemText" />

src/main/resources/mapper/SysDictMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.jointcloud.negotiation.mapper.SysDictMapper">
+<mapper namespace="net.jointcloud.market.mapper.SysDictMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="net.jointcloud.negotiation.domain.entity.SysDictEntity">
+    <resultMap id="BaseResultMap" type="net.jointcloud.market.domain.entity.SysDictEntity">
         <id column="id" property="id" />
         <result column="dict_name" property="dictName" />
         <result column="dict_code" property="dictCode" />

src/test/java/net/jointcloud/market/ImageServiceTest.java

@@ -1,7 +1,7 @@
-package net.jointcloud.negotiation;
+package net.jointcloud.market;
 
-import net.jointcloud.negotiation.domain.entity.ImageEntity;
-import net.jointcloud.negotiation.service.ImageService;
+import net.jointcloud.market.domain.entity.ImageEntity;
+import net.jointcloud.market.service.ImageService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

src/test/java/net/jointcloud/market/MarketApplicationTests.java

@@ -1,10 +1,10 @@
-package net.jointcloud.negotiation;
+package net.jointcloud.market;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
-class NegotiationApplicationTests {
+class MarketApplicationTests {
 
 	@Test
 	void contextLoads() {