diff --git a/Ylt/gw-charge/deploy/dev/deploy_dev_gw-charge-svc.yaml b/Ylt/gw-charge/deploy/dev/deploy_dev_gw-charge-svc.yaml index 685ab73..7948917 100644 --- a/Ylt/gw-charge/deploy/dev/deploy_dev_gw-charge-svc.yaml +++ b/Ylt/gw-charge/deploy/dev/deploy_dev_gw-charge-svc.yaml @@ -1,17 +1,24 @@ +# 表示使用的是 Kubernetes 的核心 API 版本 1,这是最稳定和广泛使用的API版本之一,通常用于Service、Pod、Namespace等核心资源。 apiVersion: v1 +# Service 是一种核心资源,用于定义微服务架构中的服务访问策略。 kind: Service +# 资源的元数据信息 metadata: + # 组键值对,用于标识和选择资源。标签可以用于组织资源、选择资源进行操作,以及在Service中定义Pod的选择器。 labels: + # 用来选择和分组具有相同应用名称的资源。 app: gw-charge name: gw-charge namespace: yibin-charge +# 服务监听设置 spec: ports: - name: http - port: 7001 - protocol: TCP - targetPort: 7001 - nodePort: 30701 + port: 7001 # 服务监听的端口号,在 Kubernetes 集群内部可以通过这个端口访问服务。 + protocol: TCP # 指定端口使用的协议,这里是 TCP,适用于大多数 web 服务和网络通信。 + targetPort: 7001 # Pod 中容器监听的端口号。当请求到达 Service 时,Service 会将流量转发到 Pod 的这个端口。 + nodePort: 30701 # 当 Service 的类型是 NodePort 时,nodePort 字段指定了在每个集群节点的 IP 上打开的端口,外部可以通过此端口访问服务。这个端口号应该是一个 1 到 65535 范围内的值,并且确保在节点上没有其他服务使用该端口。 + # 在 Kubernetes 的 Service 配置中,selector 是一个非常重要的字段。它定义了服务如何与 Pod 建立联系,即服务通过选择器来识别并转发流量到哪些 Pod 上。选择器是一个标签查询,用于匹配 Pod 的标签(labels) selector: app: gw-charge tier: backend diff --git a/Ylt/gw-charge/deploy/dev/deploy_dev_gw-charge.yaml b/Ylt/gw-charge/deploy/dev/deploy_dev_gw-charge.yaml index ba30a02..34c4e22 100644 --- a/Ylt/gw-charge/deploy/dev/deploy_dev_gw-charge.yaml +++ b/Ylt/gw-charge/deploy/dev/deploy_dev_gw-charge.yaml @@ -29,6 +29,8 @@ spec: value: C.UTF-8 - name: JAVA_OPTS value: '-Dspring.profiles.active=dev' + # $REGISTRY_HARBOR: 这是一个环境变量,代表镜像仓库(Registry)的地址或主机名。在 Kubernetes 中,环境变量通常用于存储配置信息,以便在部署时注入到 Pod 中。 + # $REGISTRY_HARBOR_NAMESPACE: 这是另一个环境变量,代表在镜像仓库中的命名空间或项目名称。 image: $REGISTRY_HARBOR/$REGISTRY_HARBOR_NAMESPACE/gw-charge:latest readinessProbe: httpGet: diff --git a/操作文档/14、阿里云服务运维.md b/操作文档/14、阿里云服务运维.md index cffc89f..f62693f 100644 --- a/操作文档/14、阿里云服务运维.md +++ b/操作文档/14、阿里云服务运维.md @@ -8,6 +8,12 @@ +### 疑问 + +- ![](https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202408201551616.png) + + + #### 1、广告产业园上网$IP$ diff --git a/ZhuQue/.gitignore b/资料/ZhuQue/.gitignore similarity index 100% rename from ZhuQue/.gitignore rename to 资料/ZhuQue/.gitignore diff --git a/ZhuQue/Doc/MongoDB使用办法.txt b/资料/ZhuQue/Doc/MongoDB使用办法.txt similarity index 100% rename from ZhuQue/Doc/MongoDB使用办法.txt rename to 资料/ZhuQue/Doc/MongoDB使用办法.txt diff --git a/ZhuQue/Dockerfile b/资料/ZhuQue/Dockerfile similarity index 100% rename from ZhuQue/Dockerfile rename to 资料/ZhuQue/Dockerfile diff --git a/ZhuQue/Sql/黄海增加的表.sql b/资料/ZhuQue/Sql/黄海增加的表.sql similarity index 100% rename from ZhuQue/Sql/黄海增加的表.sql rename to 资料/ZhuQue/Sql/黄海增加的表.sql diff --git a/ZhuQue/ZhuQue.iml b/资料/ZhuQue/ZhuQue.iml similarity index 100% rename from ZhuQue/ZhuQue.iml rename to 资料/ZhuQue/ZhuQue.iml diff --git a/ZhuQue/pom.xml b/资料/ZhuQue/pom.xml similarity index 100% rename from ZhuQue/pom.xml rename to 资料/ZhuQue/pom.xml diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/RepeatIntercetpor.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/RepeatIntercetpor.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/RepeatIntercetpor.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/RepeatIntercetpor.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/XssHandler.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/XssHandler.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/XssHandler.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/XssHandler.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/XssHttpServletRequestWrapper.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/XssHttpServletRequestWrapper.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/XssHttpServletRequestWrapper.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/XssHttpServletRequestWrapper.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Index/Controller/IndexController.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Index/Controller/IndexController.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Index/Controller/IndexController.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Index/Controller/IndexController.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterceptor.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterceptor.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterceptor.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterceptor.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterface.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterface.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterface.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterface.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterceptor.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterceptor.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterceptor.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterceptor.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterface.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterface.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterface.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterface.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterceptor.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterceptor.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterceptor.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterceptor.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterface.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterface.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterface.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterface.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterceptor.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterceptor.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterceptor.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterceptor.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterface.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterface.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterface.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterface.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumbericInterceptor.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumbericInterceptor.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumbericInterceptor.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumbericInterceptor.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumericInterface.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumericInterface.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumericInterface.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumericInterface.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsSysAdminInterface.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsSysAdminInterface.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsSysAdminInterface.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsSysAdminInterface.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterceptor.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterceptor.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterceptor.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterceptor.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterface.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterface.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterface.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterface.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Plugin/RedisCluster.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Plugin/RedisCluster.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Plugin/RedisCluster.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Plugin/RedisCluster.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Plugin/RedisClusterPlugin.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Plugin/RedisClusterPlugin.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Plugin/RedisClusterPlugin.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Plugin/RedisClusterPlugin.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Start.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Start.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Start.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Start.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Test/TestKeTuo.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Test/TestKeTuo.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Test/TestKeTuo.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Test/TestKeTuo.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Test/TestMongoDb.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Test/TestMongoDb.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Test/TestMongoDb.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Test/TestMongoDb.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Tools/GenerateMysqlDoc.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Tools/GenerateMysqlDoc.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Tools/GenerateMysqlDoc.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Tools/GenerateMysqlDoc.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/CommonUtil.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/CommonUtil.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/CommonUtil.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/CommonUtil.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/ConfigUtil.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/ConfigUtil.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/ConfigUtil.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/ConfigUtil.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/DateUtil.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/DateUtil.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/DateUtil.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/DateUtil.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/FileSizeUtil.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/FileSizeUtil.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/FileSizeUtil.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/FileSizeUtil.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IDCardUtil.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IDCardUtil.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IDCardUtil.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IDCardUtil.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IdCardGenerator.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IdCardGenerator.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IdCardGenerator.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IdCardGenerator.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IpUtil.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IpUtil.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IpUtil.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IpUtil.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/JSONUtil.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/JSONUtil.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/JSONUtil.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/JSONUtil.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/JwtUtil.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/JwtUtil.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/JwtUtil.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/JwtUtil.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/LogBackLog.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/LogBackLog.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/LogBackLog.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/LogBackLog.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/LogBackLogFactory.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/LogBackLogFactory.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/LogBackLogFactory.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/LogBackLogFactory.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/PassWordUtil.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/PassWordUtil.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/PassWordUtil.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/PassWordUtil.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/PkUtil.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/PkUtil.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/PkUtil.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/PkUtil.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RandomGeneratorUtil.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RandomGeneratorUtil.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RandomGeneratorUtil.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RandomGeneratorUtil.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RedisKit.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RedisKit.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RedisKit.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RedisKit.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/ResultVO.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/ResultVO.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/ResultVO.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/ResultVO.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RsaUtils.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RsaUtils.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RsaUtils.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RsaUtils.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SignUtils.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SignUtils.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SignUtils.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SignUtils.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SimilarUtil.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SimilarUtil.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SimilarUtil.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SimilarUtil.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SqlInjectionUtil.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SqlInjectionUtil.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SqlInjectionUtil.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SqlInjectionUtil.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/TelNumGenerator.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/TelNumGenerator.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/TelNumGenerator.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/TelNumGenerator.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java similarity index 89% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java index 2ea2cba..1d3096e 100644 --- a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java +++ b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java @@ -31,8 +31,7 @@ public class YltController extends Controller { * @param order_no */ @Before({POST.class}) - //@IsLoginInterface({}) - // @PostMapping("/station/isThirdPartyStation") + @IsLoginInterface({}) public ResultVO isThirdPartyStation(String order_no) { Record record = ym.getThirdPartyStation(order_no); if (record == null) { @@ -44,9 +43,8 @@ public class YltController extends Controller { /** * 功能:获取用户的车牌列表 */ - @Before({GET.class}) + @Before({POST.class}) @IsLoginInterface({}) - // @PostMapping("/station/getCarList") public ResultVO getCarList() { //获取当前登录人员信息 int userId = Integer.parseInt(getRequest().getHeader("userId")); @@ -198,4 +196,26 @@ public class YltController extends Controller { } return null; } + + /** + * 功能:对于指定的订单号,进行补单【正向】 + * + * @param orderNo + * @return + */ + public ResultVO completeUnReportOrderByOrderNo(String orderNo) { + //查询挂起订单 + EquipmentChargeOrderDO hangUpOrder = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(orderNo); + asyncTaskService.completeUnReportOrder(hangUpOrder); + Record record = ym.getLastUnReportOrderByOrderNoTrack(orderNo); + String fail_reason = record.getStr("fail_reason"); + boolean success = true; + //补单失败,补单异常 + if (!StrKit.isBlank(fail_reason)) { + if (fail_reason.indexOf("补单失败") >= 0 || fail_reason.indexOf("补单异常") >= 0) { + success = false; + } + } + return ResultVO.custom(fail_reason, success ? 1000 : -1); + } } \ No newline at end of file diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java b/资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java similarity index 100% rename from ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java rename to 资料/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java diff --git a/ZhuQue/src/main/resource/Sql/test.sql b/资料/ZhuQue/src/main/resource/Sql/test.sql similarity index 100% rename from ZhuQue/src/main/resource/Sql/test.sql rename to 资料/ZhuQue/src/main/resource/Sql/test.sql diff --git a/ZhuQue/src/main/resource/application.properties b/资料/ZhuQue/src/main/resource/application.properties similarity index 100% rename from ZhuQue/src/main/resource/application.properties rename to 资料/ZhuQue/src/main/resource/application.properties diff --git a/ZhuQue/src/main/resource/fzby.txt b/资料/ZhuQue/src/main/resource/fzby.txt similarity index 100% rename from ZhuQue/src/main/resource/fzby.txt rename to 资料/ZhuQue/src/main/resource/fzby.txt diff --git a/ZhuQue/src/main/resource/log4j.properties b/资料/ZhuQue/src/main/resource/log4j.properties similarity index 100% rename from ZhuQue/src/main/resource/log4j.properties rename to 资料/ZhuQue/src/main/resource/log4j.properties diff --git a/ZhuQue/src/main/resource/logback.xml b/资料/ZhuQue/src/main/resource/logback.xml similarity index 100% rename from ZhuQue/src/main/resource/logback.xml rename to 资料/ZhuQue/src/main/resource/logback.xml diff --git a/ZhuQue/src/main/resource/undertow.properties b/资料/ZhuQue/src/main/resource/undertow.properties similarity index 100% rename from ZhuQue/src/main/resource/undertow.properties rename to 资料/ZhuQue/src/main/resource/undertow.properties diff --git a/ZhuQue/生成依赖jar.bat b/资料/ZhuQue/生成依赖jar.bat similarity index 100% rename from ZhuQue/生成依赖jar.bat rename to 资料/ZhuQue/生成依赖jar.bat