diff --git a/deployment-master.yaml b/deployment-master.yaml
index 8bd9734..1dc2948 100644
--- a/deployment-master.yaml
+++ b/deployment-master.yaml
@@ -57,7 +57,7 @@ spec:
containers:
- name: biz-service-ebtp-extend
image: harbor.dcos.xixian.unicom.local/eshop/biz-service-ebtp-extend:latest
- args: ["java", "-Djava.security.egd=file:/dev/./urandom", "-javaagent:/pinpoint/tianyan-springboot-agent/pinpoint-bootstrap-1.8.0.jar", "-Dpinpoint.agentId=$(MY_POD_IP)","-Dpinpoint.applicationName=$(APP_NAME)", "-Dpinpoint.licence=$(AGENT_LICENCE_DEV)", "-jar", "/app.jar"]
+ args: ["java", "-Djava.security.egd=file:/dev/./urandom", "-javaagent:/pinpoint/tianyan-springboot-agent/pinpoint-bootstrap-1.8.0.jar", "-Dpinpoint.agentId=$(MY_POD_IP)","-Dpinpoint.applicationName=$(APP_NAME)", "-Dpinpoint.licence=$(AGENT_LICENCE)", "-jar", "/app.jar"]
volumeMounts:
- name: log
mountPath: /log
diff --git a/lib/access_token1.3.jar b/lib/access_token1.3.jar
new file mode 100644
index 0000000..dc162fc
Binary files /dev/null and b/lib/access_token1.3.jar differ
diff --git a/pom.xml b/pom.xml
index d9e5db1..2891d44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
com.chinaunicom.ebtp
mall-ebtp-cloud-parent
- 0.0.1-SNAPSHOT
+ 2.0.0-SNAPSHOT
com.chinaunicom.mall.ebtp
@@ -20,29 +20,10 @@
com.chinaunicom.mall.ebtp
uboot-core
- 0.0.1-SNAPSHOT
-
-
-
- com.chinaunicom.ebtp
- mall-ebtp-cloud-attachment-sdk
-
-
-
- com.chinaunicom.ebtp
- mall-ebtp-cloud-apollo-starter
+ 2.0.0-SNAPSHOT
-
- mysql
- mysql-connector-java
-
-
-
- org.apache.shardingsphere
- sharding-jdbc-spring-boot-starter
-
-
+
com.deepoove
poi-tl
@@ -98,9 +79,9 @@
cryp.access
accessToken
- 1.0
+ 1.3
system
- ${basedir}/lib/access_token1.1.jar
+ ${basedir}/lib/access_token1.3.jar
diff --git a/sim.yaml b/sim.yaml
new file mode 100644
index 0000000..20efd36
--- /dev/null
+++ b/sim.yaml
@@ -0,0 +1,115 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: biz-service-ebtp-extend #[1] Deployment名称,可填写微服务名称
+ namespace: default
+ labels:
+ app: biz-service-ebtp-extend
+
+spec:
+ replicas: 3
+ strategy:
+ rollingUpdate:
+ maxSurge: 1
+ maxUnavailable: 1
+ selector:
+ matchLabels:
+ app: biz-service-ebtp-extend #[2] 选择器匹配时标签名称,可填写微服务名称
+ template:
+ metadata:
+ labels:
+ app: biz-service-ebtp-extend #[3] 模板名称,可填写微服务名称
+ annotations:
+ prometheus.io/port: '18018'
+ prometheus.io/jl-pod: 'true'
+ spec:
+ volumes:
+ - name: log
+ hostPath:
+ path: /var/lib/docker/log/349553515466-preprod/default-group/all
+ affinity:
+ podAntiAffinity:
+ requiredDuringSchedulingIgnoredDuringExecution:
+ - labelSelector:
+ matchExpressions:
+ - key: app
+ operator: In
+ values:
+ - biz-service-ebtp-extend
+ topologyKey: "kubernetes.io/hostname"
+ containers:
+ - name: biz-service-ebtp-extend #[6] 必选,容器名称,可填写微服务名称
+ image: harbor.dcos.guangzhou.unicom.local/eshop/biz-service-ebtp-extend:latest #[7] 镜像名称,请把biz-service-ebtp-extend替换为服务名称
+ args: ["java", "-Djava.security.egd=file:/dev/./urandom", "-javaagent:/pinpoint/tianyan-springboot-agent/pinpoint-bootstrap-1.8.0.jar", "-Dpinpoint.agentId=$(MY_POD_IP)","-Dpinpoint.applicationName=$(APP_NAME)", "-Dpinpoint.licence=$(AGENT_LICENCE_DEV)", "-jar", "/app.jar"]
+ volumeMounts:
+ - name: log
+ mountPath: /log
+ ports:
+ - containerPort: 18018
+ livenessProbe:
+ failureThreshold: 3
+ httpGet:
+ port: 18018
+ path: /actuator/health
+ scheme: HTTP
+ initialDelaySeconds: 300
+ periodSeconds: 60
+ successThreshold: 1
+ timeoutSeconds: 2
+ readinessProbe:
+ failureThreshold: 1
+ httpGet:
+ port: 18018
+ path: /actuator/health
+ scheme: HTTP
+ periodSeconds: 5
+ successThreshold: 2
+ timeoutSeconds: 2
+ resources:
+ requests:
+ cpu: 1000m
+ memory: 2Gi
+ limits:
+ cpu: 3000m
+ memory: 6Gi
+ env:
+ - name: APP_NAME
+ value: biz_ebtp_extend
+ - name: AGENT_LICENCE
+ value: 527BFA7B28577578
+ - name: APOLLO_CONFIGSERVICE
+ value: http://apollo-configservice:8080
+ - name: MY_POD_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
+ - name: JAVA_TOOL_OPTIONS
+ value:
+ -XX:+UnlockExperimentalVMOptions
+ -XX:+UseContainerSupport
+ -XX:+UseCGroupMemoryLimitForHeap
+ -XX:InitialRAMPercentage=40.0
+ -XX:MinRAMPercentage=20.0
+ -XX:MaxRAMPercentage=80.0
+---
+kind: Service
+apiVersion: v1
+metadata:
+ name: biz-service-ebtp-extend-svc # [11] service的名字,格式为“服务名-svc”
+ namespace: default
+ labels:
+ service: biz-service-ebtp-extend-svc # [12] service的标签,可与参数[11]相同
+ annotations:
+ prometheus.io/port: '18018' #[13] prometheus自动发现service的端口,也是该微服务所使用的端口,与参数[4]相同
+ prometheus.io/jl-svc: 'true'
+
+spec:
+ ports:
+ - port: 18018 #[15] 与参数4相同
+ targetPort: 18018 #[16] 与参数4相同
+ selector:
+ app: biz-service-ebtp-extend #[17] 该service对应Deployment的名字,与参数[1]相同
+---
+
+
+
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java
index ba1d66b..bd794c0 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java
@@ -3,15 +3,11 @@ package com.chinaunicom.mall.ebtp.extend.crypconfigure.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.chinaunicom.baas.util.AccessToken;
import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService;
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
import com.chinaunicom.mall.ebtp.common.constant.CommonConstants;
import com.chinaunicom.mall.ebtp.common.crypto.service.CrypServiceImpl;
-import com.chinaunicom.mall.ebtp.common.crypto.tenderfee.test;
import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum;
import com.chinaunicom.mall.ebtp.common.uniBss.constant.UniBssConstant;
import com.chinaunicom.mall.ebtp.common.uniBss.entity.*;
@@ -27,13 +23,11 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.ClassPathResource;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -54,16 +48,21 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl jsonMap = JSONArray.parseObject(json,Map.class);
+ Map jsonMap = JSONArray.parseObject(json);
Object signObject = new Object();
if(jsonMap.get("BODY_LIST")!=null){
@@ -200,14 +213,23 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl parseJSON2Map(String jsonStr){
+ Map map = new HashMap();
+ Map strmap = JSONArray.parseObject(jsonStr,Map.class);
+ for(Object k : strmap.keySet()){
+ Object v = strmap.get(k);
+ if(v instanceof JSONArray){
+ List