From 1d13b606d6f433f2d09cb13d9fa38777c6b85cf4 Mon Sep 17 00:00:00 2001 From: gwbvipvip Date: Mon, 25 Mar 2024 17:46:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/CheckService/Services/CheckServices.cs | 2 +- BPA.KitChen.GroupMealOrder/Handlers/RequestAuditFiltercs.cs | 4 ++-- BPA.KitChen.GroupMealOrder/Properties/launchSettings.json | 2 +- BPA.KitChen.GroupMealOrder/appsettings.json | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/BPA.KitChen.GroupMealOrder.Application/Service/AExternalPlatform/Service/CheckService/Services/CheckServices.cs b/BPA.KitChen.GroupMealOrder.Application/Service/AExternalPlatform/Service/CheckService/Services/CheckServices.cs index 75ee515..a5a6693 100644 --- a/BPA.KitChen.GroupMealOrder.Application/Service/AExternalPlatform/Service/CheckService/Services/CheckServices.cs +++ b/BPA.KitChen.GroupMealOrder.Application/Service/AExternalPlatform/Service/CheckService/Services/CheckServices.cs @@ -85,7 +85,7 @@ namespace BPA.KitChen.GroupMealOrder.Application.Service.AExternalPlatform.Servi try { Dictionary dic = new Dictionary(); - var url = App.Configuration["GroupMealBaseUrl"] + "api/authorization/GetCompanyById?id=" + tenantId; + var url = App.Configuration["GroupMealBaseUrl"] + "api/authorization/GetCompanyByIdNew?id=" + tenantId; var jsonData = HttpHelper.HttpGet(url, null, dic, "application/json"); var data = JsonConvert.DeserializeObject>(jsonData); if (data.statusCode != 200) throw Oops.Oh(ErrorCodeEnum.Code10016); diff --git a/BPA.KitChen.GroupMealOrder/Handlers/RequestAuditFiltercs.cs b/BPA.KitChen.GroupMealOrder/Handlers/RequestAuditFiltercs.cs index e5891c5..12bd17a 100644 --- a/BPA.KitChen.GroupMealOrder/Handlers/RequestAuditFiltercs.cs +++ b/BPA.KitChen.GroupMealOrder/Handlers/RequestAuditFiltercs.cs @@ -157,9 +157,9 @@ namespace BPA.KitChen.GroupMealOrder.Handlers List proplist = new List(); foreach (var parameter in parameters) { - var stingA = DtoValidator.GetSign(parameter.Value); + // var stingA = DtoValidator.GetSign(parameter.Value); //var sign = DtoValidator.GetAttributePrice(parameter.Value, "sign"); - await _checkServices.CheckSign(key, stingA, sign); + await _checkServices.CheckSign(key, "stingA", sign); } } diff --git a/BPA.KitChen.GroupMealOrder/Properties/launchSettings.json b/BPA.KitChen.GroupMealOrder/Properties/launchSettings.json index b924d70..c2cb0bd 100644 --- a/BPA.KitChen.GroupMealOrder/Properties/launchSettings.json +++ b/BPA.KitChen.GroupMealOrder/Properties/launchSettings.json @@ -8,7 +8,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" }, "dotnetRunMessages": true, - "applicationUrl": "http://localhost:5003" + "applicationUrl": "http://192.168.1.16:5003" }, "IIS Express": { "commandName": "IISExpress", diff --git a/BPA.KitChen.GroupMealOrder/appsettings.json b/BPA.KitChen.GroupMealOrder/appsettings.json index b3635aa..16dc37a 100644 --- a/BPA.KitChen.GroupMealOrder/appsettings.json +++ b/BPA.KitChen.GroupMealOrder/appsettings.json @@ -6,8 +6,8 @@ } }, "SAAS_Manage": "http://10.2.1.26:21995/saasbase/", - "GroupMealBaseUrl": "http://localhost:5001/", - "GroupMealUrl": "http://localhost:5002/", + "GroupMealBaseUrl": "http://192.168.1.16:5001/", + "GroupMealUrl": "http://192.168.1.16:5002/", "DomainName": "https://bpa.black-pa.com:21995/order/", "DBConnectionStr": "server=10.2.1.21;Port=3306;Database=bpa_kitchen_groupmealorder;Uid=root;Pwd=cygadmin;", "DBConnectionLogStr": "server=10.2.1.21;Port=3306;Database=bpa_kitchen_groupmeallog;Uid=root;Pwd=cygadmin;", From 0399610909d610fa6a83d12b33ab91d691991901 Mon Sep 17 00:00:00 2001 From: gwbvipvip Date: Tue, 26 Mar 2024 13:21:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BPA.KitChen.GroupMealOrder/appsettings.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/BPA.KitChen.GroupMealOrder/appsettings.json b/BPA.KitChen.GroupMealOrder/appsettings.json index 16dc37a..2733fd3 100644 --- a/BPA.KitChen.GroupMealOrder/appsettings.json +++ b/BPA.KitChen.GroupMealOrder/appsettings.json @@ -5,10 +5,9 @@ "Microsoft.AspNetCore": "Warning" } }, - "SAAS_Manage": "http://10.2.1.26:21995/saasbase/", - "GroupMealBaseUrl": "http://192.168.1.16:5001/", - "GroupMealUrl": "http://192.168.1.16:5002/", - "DomainName": "https://bpa.black-pa.com:21995/order/", + "GroupMealBaseUrl": "http://192.168.1.16:5001/", //团餐基础资料 + "GroupMealUrl": "http://192.168.1.16:5002/", //团餐 + "DomainName": "https://bpa.black-pa.com:21995/order/",//回调 "DBConnectionStr": "server=10.2.1.21;Port=3306;Database=bpa_kitchen_groupmealorder;Uid=root;Pwd=cygadmin;", "DBConnectionLogStr": "server=10.2.1.21;Port=3306;Database=bpa_kitchen_groupmeallog;Uid=root;Pwd=cygadmin;", "AllowedHosts": "*", From ca93da75690a7b71549928327e57a67f42d7e9c8 Mon Sep 17 00:00:00 2001 From: bpa <1370533105@qq.com> Date: Tue, 26 Mar 2024 06:15:51 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'k8s=5Fgroupmealorder.?= =?UTF-8?q?yaml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- k8s_groupmealorder.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/k8s_groupmealorder.yaml b/k8s_groupmealorder.yaml index cb2673b..5503fb8 100644 --- a/k8s_groupmealorder.yaml +++ b/k8s_groupmealorder.yaml @@ -1,23 +1,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: groupmealorder + name: order namespace: kube- spec: selector: matchLabels: - app: groupmealorder + app: order replicas: 1 template: metadata: labels: - app: groupmealorder + app: order spec: containers: - - image: 10.2.1.24:10242/bpa/groupmealorder: + - image: 10.2.1.24:10242/bpa/order: imagePullPolicy: IfNotPresent - name: groupmealorder + name: order env: - name: branch value: @@ -28,7 +28,7 @@ spec: protocol: TCP volumeMounts: - mountPath: "/app/appsettings.json" - name: groupmealorder-config + name: order-config readOnly: true subPath: appsetting - mountPath: "/etc/localtime" @@ -41,9 +41,9 @@ spec: cpu: "500m" memory: "512Mi" volumes: - - name: groupmealorder-config + - name: order-config configMap: - name: groupmealorder-config + name: order-config - name: timezone hostPath: path: /usr/share/zoneinfo/Asia/Shanghai @@ -52,8 +52,8 @@ kind: Service apiVersion: v1 metadata: labels: - app: groupmealorder - name: groupmealorder + app: order + name: order namespace: kube- spec: type: ClusterIP @@ -61,4 +61,4 @@ spec: - port: 80 name: http selector: - app: groupmealorder + app: order From 03ca4b7d15eba7f573cb73b45a5b0bac6a3c3ff9 Mon Sep 17 00:00:00 2001 From: bpa <1370533105@qq.com> Date: Tue, 26 Mar 2024 06:17:02 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'Jenkinsfile'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ce99671..1034142 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -75,7 +75,7 @@ pipeline{ if(params.operation=='develop') { - sh "docker build -t 10.2.1.24:10242/bpa/groupmealorder:${build_tag} ." + sh "docker build -t 10.2.1.24:10242/bpa/order:${build_tag} ." } } @@ -91,7 +91,7 @@ pipeline{ sh "docker login -u ${harborUser} -p ${harborPassword} 10.2.1.24:10242" if(params.operation=='develop') { - sh "docker push 10.2.1.24:10242/bpa/groupmealorder:${build_tag}" + sh "docker push 10.2.1.24:10242/bpa/order:${build_tag}" } } @@ -112,10 +112,10 @@ pipeline{ // input "确认要部署线上环境吗？" // } -sh "sed -i 's//${build_tag}/' k8s_groupmealorder.yaml" - sh "sed -i 's//${env.BRANCH_NAME}/' k8s_groupmealorder.yaml" - sh "sed -i 's//${params.environment}/' k8s_groupmealorder.yaml" - sh "kubectl apply -f k8s_groupmealorder.yaml --record" + // sh "sed -i 's//${build_tag}/' k8s_order.yaml" + // sh "sed -i 's//${env.BRANCH_NAME}/' k8s_order.yaml" + // sh "sed -i 's//${params.environment}/' k8s_order.yaml" + // sh "kubectl apply -f k8s_order.yaml --record" From c6af960b5eceb9289ca498075c8146bbf5405c0b Mon Sep 17 00:00:00 2001 From: bpa <1370533105@qq.com> Date: Wed, 27 Mar 2024 10:29:11 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'Jenkinsfile'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1034142..54680c0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -75,7 +75,7 @@ pipeline{ if(params.operation=='develop') { - sh "docker build -t 10.2.1.24:10242/bpa/order:${build_tag} ." + sh "docker build -t 10.2.1.24:10242/bpa/groupmealorder:${build_tag} ." } } @@ -91,7 +91,7 @@ pipeline{ sh "docker login -u ${harborUser} -p ${harborPassword} 10.2.1.24:10242" if(params.operation=='develop') { - sh "docker push 10.2.1.24:10242/bpa/order:${build_tag}" + sh "docker push 10.2.1.24:10242/bpa/groupmealorder:${build_tag}" } }