From 8e85fbc2fd01ff3a057ebb0b90505fe433c355f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Fri, 14 May 2021 09:28:23 +0800 Subject: [PATCH 01/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9sim=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sim.yaml | 116 ++++++++++++++++ src/main/resources/application-sim.yml | 181 +++++++++++++++++++++++++ src/main/resources/application.yml | 2 +- 3 files changed, 298 insertions(+), 1 deletion(-) create mode 100644 sim.yaml create mode 100644 src/main/resources/application-sim.yml diff --git a/sim.yaml b/sim.yaml new file mode 100644 index 0000000..3496368 --- /dev/null +++ b/sim.yaml @@ -0,0 +1,116 @@ +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 + persistentVolumeClaim: + claimName: log-pvc + readOnly: false + 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)", "-Dspring.profiles.active=sim", "-jar", "/app.jar"] + volumeMounts: + - name: log + mountPath: /log + ports: + - containerPort: 18018 #[8] 容器需要监听的端口号，与配置文件中的server.port参数相同，与参数[4]相同 + #livenessProbe: + # failureThreshold: 3 + # httpGet: + # port: 18018 #[11] pod存活检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同 + # path: /actuator/prometheus + # scheme: HTTP + # initialDelaySeconds: 300 + # periodSeconds: 60 + # successThreshold: 1 + # timeoutSeconds: 2 + #readinessProbe: + # failureThreshold: 1 + # httpGet: + # port: 18018 #[12] pod就绪检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同 + # path: /actuator/prometheus + # 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/resources/application-sim.yml b/src/main/resources/application-sim.yml new file mode 100644 index 0000000..84c8591 --- /dev/null +++ b/src/main/resources/application-sim.yml @@ -0,0 +1,181 @@ +server: + port: 18018 + servlet: + context-path: / + +seata: + service: + vgroup-mapping: + biz-service-ebtp-extend-service-group: seata-server-jl + registry: + type: eureka + eureka: + serviceUrl: http://eureka-1-svc:8080/eureka,http://eureka-2-svc:8080/eureka,http://eureka-3-svc:8080/eureka + +# 对应 apollo 配置中心的应用名 +app: + id: biz-service-ebtp-extend + +# Apollo 配置信息 +apollo: + meta: http://10.242.31.54:6002/ + bootstrap: + namespace: application + enabled: true + eagerLoad: + enabled: true + +spring: + aop: + auto: true #开启spring的aop配置 + proxy-target-class: true + + application: + name: biz-service-ebtp-extend + + shardingsphere: + datasource: + names: ds0 + ds0: + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + username: mall + password: unicom + jdbc-url: jdbc:mysql://10.125.160.44:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://10.125.160.44:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + filters: stat,wall,log4j + maxActive: 20 + initialSize: 1 + maxWait: 60000 + minIdle: 1 + timeBetweenEvictionRunsMillis: 60000 + minEvictableIdleTimeMillis: 300000 + validationQuery: select 'x' + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + poolPreparedStatements: true + maxOpenPreparedStatements: 20 + connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000 + props: + sql: + show: true + + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + serialization: + write-dates-as-timestamps: false + + # 天宫Kafka增加了安全认证，需要配置安全属性 + kafka: + bootstrap-servers: 10.125.164.24:32002,10.125.164.192:32096,10.125.164.89:32002 + template: + default-topic: jl_eshop + + # 生产者配置参数 + producer: + client-id: core-service-ebtp-crypt + properties: + security.protocol: SASL_PLAINTEXT + sasl.mechanism: SCRAM-SHA-256 + sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="eshop-kafka" password="Unicom#135"; + + # 消费者配置参数 + consumer: + group-id: core-service-ebtp-crypt-consumer + auto-offset-reset: latest + properties: + security.protocol: SASL_PLAINTEXT + sasl.mechanism: SCRAM-SHA-256 + sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="eshop-kafka" password="Unicom#135"; + + # 生产区 redis 配置 + redis: + sentinel: + master: 10.125.164.23:32516 + nodes: 10.125.164.24:32510,10.125.164.90:32515,10.125.164.89:32516 + password: Unicom#135 + +# 天宫Eureka配置 +eureka: + client: + service-url: + defaultZone: http://eureka-1-svc:8080/eureka,http://eureka-2-svc:8080/eureka,http://eureka-3-svc:8080/eureka + instance: + prefer-ip-address: true + instance-ip: ${spring.cloud.client.ip-address}:${server.port} + +mybatis-plus: + configuration: + # 是否开启自动驼峰命名规则映射:从数据库列名到Java属性驼峰命名的类似映射 + map-underscore-to-camel-case: true + auto-mapping-behavior: full + # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml + global-config: + # 逻辑删除配置 + db-config: + # logic-delete-field: flag # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2) @TableLogic + logic-delete-value: deleted # 逻辑已删除值 + logic-not-delete-value: normal # 逻辑未删除值 + +# --------------feign ------------ +feign: + httpclient: + enabled: false + okhttp: + enabled: true + client: + config: + default: + connect-timeout: 20000 + read-timeout: 20000 + +hystrix: + command: + default: + execution: + timeout: + enabled: true + isolation: + strategy: SEMAPHORE + thread: + timeoutInMilliseconds: 200000 #熔断超时时间 + circuitBreaker: + sleepWindowInMilliseconds: 20000 + forceClosed: true + +ribbon: + ReadTimeout: 20000 #请求处理的超时时间 + ConnectTimeout: 20000 #请求连接超时时间 + MaxAutoRetries: 0 #对当前实例的重试次数 + MaxAutoRetriesNextServer: 1 #切换实例的重试次数 1 + +mconfig: + workerId: 1 + datacenterId: 1 + # 服务名 + feign: + name: + open: biz-service-ebtp-opening #开标大厅服务 + process: biz-service-ebtp-process #评审流程服务 + project: biz-service-ebtp-project #项目服务 + resps: biz-service-ebtp-resps #应答结构化服务 + rsms: biz-service-ebtp-rsms #评审结构化服务 + tender: biz-service-ebtp-tender #投标服务 + documentcenter: core-service-document-center #文档中心 + +document: + clientHttpUrl: http://10.238.25.112:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749 + +# 用户暴露给 prometheus 的健康数据 +management: + endpoints: + web: + exposure: + include: "*" + cors: + allowed-origins: "*" + allowed-methods: "*" diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f2b90d5..bd2fba5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: uat \ No newline at end of file + active: sim \ No newline at end of file From 4fe1d2814b4288fe818a16655b55cd07fa3bfe9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Fri, 14 May 2021 14:44:23 +0800 Subject: [PATCH 02/40] Update application-sim.yml --- src/main/resources/application-sim.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/application-sim.yml b/src/main/resources/application-sim.yml index 84c8591..3e8aaa6 100644 --- a/src/main/resources/application-sim.yml +++ b/src/main/resources/application-sim.yml @@ -18,7 +18,7 @@ app: # Apollo 配置信息 apollo: - meta: http://10.242.31.54:6002/ + meta: http://10.242.31.54:6001 bootstrap: namespace: application enabled: true @@ -41,8 +41,8 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver username: mall password: unicom - jdbc-url: jdbc:mysql://10.125.160.44:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - url: jdbc:mysql://10.125.160.44:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true filters: stat,wall,log4j maxActive: 20 initialSize: 1 @@ -79,7 +79,7 @@ spring: properties: security.protocol: SASL_PLAINTEXT sasl.mechanism: SCRAM-SHA-256 - sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="eshop-kafka" password="Unicom#135"; + sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="eshop-kafka-sim" password="Unicom#135"; # 消费者配置参数 consumer: @@ -88,12 +88,12 @@ spring: properties: security.protocol: SASL_PLAINTEXT sasl.mechanism: SCRAM-SHA-256 - sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="eshop-kafka" password="Unicom#135"; + sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="eshop-kafka-sim" password="Unicom#135"; # 生产区 redis 配置 redis: sentinel: - master: 10.125.164.23:32516 + master: eshop-redis-sim nodes: 10.125.164.24:32510,10.125.164.90:32515,10.125.164.89:32516 password: Unicom#135 @@ -168,7 +168,7 @@ mconfig: documentcenter: core-service-document-center #文档中心 document: - clientHttpUrl: http://10.238.25.112:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749 + clientHttpUrl: http://10.242.31.54:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749 # 用户暴露给 prometheus 的健康数据 management: From e8319836b59668a047343d4509e4c20d4c6c51dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Wed, 26 May 2021 18:01:41 +0800 Subject: [PATCH 03/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=8C=82=E5=9C=A8=E5=8D=B7=E4=BD=8D=E7=BD=AE=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0k8s=E6=8E=A2=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sim.yaml | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/sim.yaml b/sim.yaml index 3496368..d507c81 100644 --- a/sim.yaml +++ b/sim.yaml @@ -22,11 +22,11 @@ spec: annotations: prometheus.io/port: '18018' prometheus.io/jl-pod: 'true' - spec: + spec: volumes: - - name: log - persistentVolumeClaim: - claimName: log-pvc + - name: log + hostPath: + path: /var/lib/docker/log/349553515466-preprod/default-group/all readOnly: false affinity: podAntiAffinity: @@ -41,31 +41,31 @@ spec: 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)", "-Dspring.profiles.active=sim", "-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_DEV)", "-jar", "/app.jar"] volumeMounts: - name: log mountPath: /log ports: - - containerPort: 18018 #[8] 容器需要监听的端口号，与配置文件中的server.port参数相同，与参数[4]相同 - #livenessProbe: - # failureThreshold: 3 - # httpGet: - # port: 18018 #[11] pod存活检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同 - # path: /actuator/prometheus - # scheme: HTTP - # initialDelaySeconds: 300 - # periodSeconds: 60 - # successThreshold: 1 - # timeoutSeconds: 2 - #readinessProbe: - # failureThreshold: 1 - # httpGet: - # port: 18018 #[12] pod就绪检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同 - # path: /actuator/prometheus - # scheme: HTTP - # periodSeconds: 5 - # successThreshold: 2 - # timeoutSeconds: 2 + - 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 From cef21c5ea653dbd187a9baf129bd7cf38ff25287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Wed, 26 May 2021 18:37:09 +0800 Subject: [PATCH 04/40] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sim.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/sim.yaml b/sim.yaml index d507c81..956d715 100644 --- a/sim.yaml +++ b/sim.yaml @@ -27,7 +27,6 @@ spec: - name: log hostPath: path: /var/lib/docker/log/349553515466-preprod/default-group/all - readOnly: false affinity: podAntiAffinity: requiredDuringSchedulingIgnoredDuringExecution: From 95d75ea89f2c56eaca60c2e75292991609d5c5ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Wed, 26 May 2021 21:50:01 +0800 Subject: [PATCH 05/40] Update application-sim.yml --- src/main/resources/application-sim.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/main/resources/application-sim.yml b/src/main/resources/application-sim.yml index 3e8aaa6..d50584c 100644 --- a/src/main/resources/application-sim.yml +++ b/src/main/resources/application-sim.yml @@ -50,16 +50,6 @@ spring: minIdle: 1 timeBetweenEvictionRunsMillis: 60000 minEvictableIdleTimeMillis: 300000 - validationQuery: select 'x' - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - poolPreparedStatements: true - maxOpenPreparedStatements: 20 - connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000 - props: - sql: - show: true jackson: date-format: yyyy-MM-dd HH:mm:ss From 4a5e3cb897d5d6a7e9bb42a2f2a99ea643b5bc93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Wed, 26 May 2021 21:55:43 +0800 Subject: [PATCH 06/40] Update application-sim.yml --- src/main/resources/application-sim.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/resources/application-sim.yml b/src/main/resources/application-sim.yml index d50584c..a802dcc 100644 --- a/src/main/resources/application-sim.yml +++ b/src/main/resources/application-sim.yml @@ -50,6 +50,13 @@ spring: minIdle: 1 timeBetweenEvictionRunsMillis: 60000 minEvictableIdleTimeMillis: 300000 + validationQuery: select 1 + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + poolPreparedStatements: true + maxOpenPreparedStatements: 20 + connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000 jackson: date-format: yyyy-MM-dd HH:mm:ss From ad2083b041737fc61b028dd41e750bbfee0fbb84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Wed, 26 May 2021 22:13:14 +0800 Subject: [PATCH 07/40] Update sim.yaml --- sim.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim.yaml b/sim.yaml index 956d715..cdcc1b8 100644 --- a/sim.yaml +++ b/sim.yaml @@ -40,7 +40,7 @@ spec: 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"] + 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)", "-Dspring.profiles.active=sim", "-jar", "/app.jar"] volumeMounts: - name: log mountPath: /log From 384fdd67b7c6447144ff7215c129abb8ad62fd58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Wed, 26 May 2021 22:19:58 +0800 Subject: [PATCH 08/40] Update application-sim.yml --- src/main/resources/application-sim.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-sim.yml b/src/main/resources/application-sim.yml index a802dcc..83a97c2 100644 --- a/src/main/resources/application-sim.yml +++ b/src/main/resources/application-sim.yml @@ -50,7 +50,7 @@ spring: minIdle: 1 timeBetweenEvictionRunsMillis: 60000 minEvictableIdleTimeMillis: 300000 - validationQuery: select 1 + validationQuery: SELECT 1 testWhileIdle: true testOnBorrow: false testOnReturn: false From 570e9beeb527fdc34c4c85660682525ef858581d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Wed, 26 May 2021 22:23:05 +0800 Subject: [PATCH 09/40] Update application-sim.yml --- src/main/resources/application-sim.yml | 28 +++++--------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/src/main/resources/application-sim.yml b/src/main/resources/application-sim.yml index 83a97c2..0527d73 100644 --- a/src/main/resources/application-sim.yml +++ b/src/main/resources/application-sim.yml @@ -35,29 +35,11 @@ spring: shardingsphere: datasource: - names: ds0 - ds0: - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - username: mall - password: unicom - jdbc-url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - filters: stat,wall,log4j - maxActive: 20 - initialSize: 1 - maxWait: 60000 - minIdle: 1 - timeBetweenEvictionRunsMillis: 60000 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - poolPreparedStatements: true - maxOpenPreparedStatements: 20 - connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000 - + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + username: mall + password: unicomurl: jdbc:mysql://10.125.160.37:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 From 8a7f1b45987b0b75c53e19e9551bbef4148db224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Wed, 26 May 2021 22:26:33 +0800 Subject: [PATCH 10/40] Update application-sim.yml --- src/main/resources/application-sim.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/application-sim.yml b/src/main/resources/application-sim.yml index 0527d73..8d664ae 100644 --- a/src/main/resources/application-sim.yml +++ b/src/main/resources/application-sim.yml @@ -38,7 +38,8 @@ spring: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver username: mall - password: unicomurl: jdbc:mysql://10.125.160.37:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + password: unicom + url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true jackson: date-format: yyyy-MM-dd HH:mm:ss From 6699dee8c11880d078cab5c60ada26dfc12e0e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Wed, 26 May 2021 22:30:03 +0800 Subject: [PATCH 11/40] Update application-sim.yml --- src/main/resources/application-sim.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/resources/application-sim.yml b/src/main/resources/application-sim.yml index 8d664ae..976e529 100644 --- a/src/main/resources/application-sim.yml +++ b/src/main/resources/application-sim.yml @@ -35,11 +35,13 @@ spring: shardingsphere: datasource: - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - username: mall - password: unicom - url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + names: ds0 + ds0: + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + username: mall + password: unicom + url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true jackson: date-format: yyyy-MM-dd HH:mm:ss From 203aff83551f97df8876e5a854a2d8fb8fb7219e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Wed, 26 May 2021 22:41:57 +0800 Subject: [PATCH 12/40] Update application-sim.yml --- src/main/resources/application-sim.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-sim.yml b/src/main/resources/application-sim.yml index 976e529..1ca4e5e 100644 --- a/src/main/resources/application-sim.yml +++ b/src/main/resources/application-sim.yml @@ -41,7 +41,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver username: mall password: unicom - url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_extend?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8 jackson: date-format: yyyy-MM-dd HH:mm:ss From 0366b47cdf9350c4df14be182bfe8ca13a4f255b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E5=AE=B8=E8=88=9C?= Date: Wed, 26 May 2021 23:12:42 +0800 Subject: [PATCH 13/40] Update application-sim.yml --- src/main/resources/application-sim.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-sim.yml b/src/main/resources/application-sim.yml index 1ca4e5e..df8001f 100644 --- a/src/main/resources/application-sim.yml +++ b/src/main/resources/application-sim.yml @@ -41,8 +41,23 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver username: mall password: unicom - url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_extend?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8 - + jdbc-url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + filters: stat,wall,log4j + maxActive: 20 + initialSize: 1 + maxWait: 60000 + minIdle: 1 + timeBetweenEvictionRunsMillis: 60000 + minEvictableIdleTimeMillis: 300000 + validationQuery: select 'x' + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + poolPreparedStatements: true + maxOpenPreparedStatements: 20 + connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000 + jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 From 2230ec9549e37d68bef03f4eafc033c1ec8ca858 Mon Sep 17 00:00:00 2001 From: ajaxfan <909938737@qq.com> Date: Wed, 26 May 2021 23:23:04 +0800 Subject: [PATCH 14/40] =?UTF-8?q?=E8=B0=83=E8=AF=95shardingjdbc=E7=9A=84?= =?UTF-8?q?=E5=81=A5=E5=BA=B7=E7=9B=91=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rceHealthContributorAutoConfiguration.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/ExtendDataSourceHealthContributorAutoConfiguration.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/ExtendDataSourceHealthContributorAutoConfiguration.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/ExtendDataSourceHealthContributorAutoConfiguration.java new file mode 100644 index 0000000..ebe5c0d --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/ExtendDataSourceHealthContributorAutoConfiguration.java @@ -0,0 +1,27 @@ +package com.chinaunicom.mall.ebtp.extend; + +import java.util.Map; + +import javax.sql.DataSource; + +import org.springframework.beans.factory.ObjectProvider; +import org.springframework.boot.actuate.autoconfigure.jdbc.DataSourceHealthContributorAutoConfiguration; +import org.springframework.boot.actuate.health.AbstractHealthIndicator; +import org.springframework.boot.actuate.jdbc.DataSourceHealthIndicator; +import org.springframework.boot.jdbc.metadata.DataSourcePoolMetadataProvider; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class ExtendDataSourceHealthContributorAutoConfiguration extends DataSourceHealthContributorAutoConfiguration { + + public ExtendDataSourceHealthContributorAutoConfiguration(Map dataSources, + ObjectProvider metadataProviders) { + super(dataSources, metadataProviders); + } + + @Override + protected AbstractHealthIndicator createIndicator(DataSource source) { + return new DataSourceHealthIndicator(source, "select 1"); + } + +} From cfc46b12ebca572a0663f6a7adce538bcc678fc9 Mon Sep 17 00:00:00 2001 From: ajaxfan <909938737@qq.com> Date: Wed, 26 May 2021 23:28:15 +0800 Subject: [PATCH 15/40] =?UTF-8?q?=E5=B0=86shardingjdbc=E5=81=A5=E5=BA=B7?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E4=BB=A3=E7=A0=81=E7=A7=BB=E5=8A=A8=E5=88=B0?= =?UTF-8?q?=E8=84=9A=E6=89=8B=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rceHealthContributorAutoConfiguration.java | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/ExtendDataSourceHealthContributorAutoConfiguration.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/ExtendDataSourceHealthContributorAutoConfiguration.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/ExtendDataSourceHealthContributorAutoConfiguration.java deleted file mode 100644 index ebe5c0d..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/ExtendDataSourceHealthContributorAutoConfiguration.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.chinaunicom.mall.ebtp.extend; - -import java.util.Map; - -import javax.sql.DataSource; - -import org.springframework.beans.factory.ObjectProvider; -import org.springframework.boot.actuate.autoconfigure.jdbc.DataSourceHealthContributorAutoConfiguration; -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.jdbc.DataSourceHealthIndicator; -import org.springframework.boot.jdbc.metadata.DataSourcePoolMetadataProvider; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class ExtendDataSourceHealthContributorAutoConfiguration extends DataSourceHealthContributorAutoConfiguration { - - public ExtendDataSourceHealthContributorAutoConfiguration(Map dataSources, - ObjectProvider metadataProviders) { - super(dataSources, metadataProviders); - } - - @Override - protected AbstractHealthIndicator createIndicator(DataSource source) { - return new DataSourceHealthIndicator(source, "select 1"); - } - -} From 92a558004d8ec90a9f32cacea7fdea1855b35e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Thu, 27 May 2021 09:06:53 +0800 Subject: [PATCH 16/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sim.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim.yaml b/sim.yaml index cdcc1b8..20efd36 100644 --- a/sim.yaml +++ b/sim.yaml @@ -40,7 +40,7 @@ spec: 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)", "-Dspring.profiles.active=sim", "-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_DEV)", "-jar", "/app.jar"] volumeMounts: - name: log mountPath: /log From fc578072743a51e5fb8f21290452667776225800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Mon, 12 Jul 2021 10:11:39 +0800 Subject: [PATCH 17/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployment-master.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment-master.yaml b/deployment-master.yaml index 04c5d8d..2f68fa5 100644 --- a/deployment-master.yaml +++ b/deployment-master.yaml @@ -53,7 +53,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 From 1d64577634788e4dd88a2274a99367ed316c7143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Fri, 16 Jul 2021 11:32:32 +0800 Subject: [PATCH 18/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9post?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BizMessageConsumerController.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java index 55b6124..22ac44a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java @@ -5,12 +5,7 @@ import java.util.Optional; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; @@ -40,7 +35,7 @@ public class BizMessageConsumerController { * @return */ @ApiOperation("消息概要清单.") - @GetMapping("describeSiteMsg") + @PostMapping("describeSiteMsg") @ResponseStatus(code = HttpStatus.OK) public IBizMessagePage describeSiteMsg( @ApiParam(value = "分页参数", required = false) @RequestBody(required = false) PageDTO page) { From c0db0332e733d41d6fb682fee9baf187130bfc12 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Fri, 16 Jul 2021 14:13:40 +0800 Subject: [PATCH 19/40] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../timeService/TimeServiceConstant.java | 103 +++++++++++++----- 1 file changed, 76 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java index d88c289..412992f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java @@ -9,6 +9,7 @@ import com.chinaunicom.mall.ebtp.extend.timeService.tsa.SystemTime; import com.chinaunicom.mall.ebtp.extend.timeService.tsa.TtsAgent; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.binary.Base64; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.ClassPathResource; import java.io.InputStream; @@ -16,12 +17,19 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.Properties; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; @Slf4j public class TimeServiceConstant { public static TSAClient client; + @Value("${spring.redis.sentinel.master}") + private String redis="eshop-redis"; + public TimeServiceConstant(){ try{ Properties prop = new Properties(); @@ -44,7 +52,11 @@ public class TimeServiceConstant { * @return 时间戳加密原文 */ public String signTimeStamp(String data){ + if(redis.equals("eshop-redis-sim")){ + return ""; + } try{ + data = data!=null&&!"".equals(data)?data:"system"; //第三步：申请时间戳,向时间戳服务器发起申请时间戳请求，返回时间戳结果 TSASignedResult result = client.signTimeStamp("SHA1", data.getBytes("UTF-8")); @@ -57,7 +69,7 @@ public class TimeServiceConstant { }catch (Exception e){ log.error("申请时间戳异常", e); } - return null; + return ""; } /** * 解析时间戳 @@ -65,21 +77,28 @@ public class TimeServiceConstant { * @return 时间戳对象 */ public TtsAgent.TtsParseResult verifyTimeStamp2(String timestamp){ + String systemtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + TtsAgent.TtsParseResult ttsParseResult = new TtsAgent.TtsParseResult(systemtime,"",""); + if(redis.equals("eshop-redis-sim")){ + return ttsParseResult; + } try{ + log.info("timestamp -->"+timestamp); TSAVerifyResult verifyResult = this.verifyTimeStamp(timestamp); String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(verifyResult.getSignedTime()); - TtsAgent.TtsParseResult ttsParseResult = new TtsAgent.TtsParseResult(time, HelperUtil.bytesToHexString(verifyResult.getData()), + ttsParseResult = new TtsAgent.TtsParseResult(time, HelperUtil.bytesToHexString(verifyResult.getData()), verifyResult.getSignerSubject()); - return ttsParseResult; }catch (Exception e){ log.error("解析时间戳", e); } - return null; + return ttsParseResult; } private TSAVerifyResult verifyTimeStamp(String timestamp){ + try{ + log.info("timestamp -->"+timestamp); TSAVerifyResult verifyResult = client.verifyTimeStamp(Base64.decodeBase64(timestamp)); return verifyResult; @@ -95,14 +114,19 @@ public class TimeServiceConstant { * @return 时间戳对象 */ public TtsAgent.TtsParseResult getServiceTimeObj(String data){ - try{ - String timestamp = this.signTimeStamp(data); - TtsAgent.TtsParseResult ttsParseResult = this.verifyTimeStamp2(timestamp); + String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + TtsAgent.TtsParseResult ttsParseResult = new TtsAgent.TtsParseResult(time,"",""); + if(redis.equals("eshop-redis-sim")){ return ttsParseResult; + } + try{ + + String timestamp = this.signTimeStamp(data); + ttsParseResult = this.verifyTimeStamp2(timestamp); }catch (Exception e){ log.error("获取时间戳异常", e); } - return null; + return ttsParseResult; } /** @@ -111,16 +135,19 @@ public class TimeServiceConstant { * @return 时间 */ public String getServiceTime(String data){ + String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + if(redis.equals("eshop-redis-sim")){ + return time; + } try{ + String timestamp = this.signTimeStamp(data); TSAVerifyResult verifyResult = this.verifyTimeStamp(timestamp); - String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(verifyResult.getSignedTime()); - - return time; + time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(verifyResult.getSignedTime()); }catch (Exception e){ log.error("获取时间戳异常", e); } - return null; + return time; } @@ -130,7 +157,11 @@ public class TimeServiceConstant { * @return date时间 */ public Date getServiceDate(String data){ + if(redis.equals("eshop-redis-sim")){ + return new Date(); + } try{ + String timestamp = this.signTimeStamp(data); TSAVerifyResult verifyResult = this.verifyTimeStamp(timestamp); Date date = verifyResult.getSignedTime(); @@ -138,7 +169,7 @@ public class TimeServiceConstant { }catch (Exception e){ log.error("获取时间戳异常", e); } - return null; + return new Date(); } /** * 获取年月日时分秒分割存储对象 @@ -146,11 +177,9 @@ public class TimeServiceConstant { * @return SystemTime */ public SystemTime getServiceSystemTime(String data){ - try{ - String timestamp = this.signTimeStamp(data); - TSAVerifyResult verifyResult = this.verifyTimeStamp(timestamp); - Date date = verifyResult.getSignedTime(); - SystemTime systemTime = new SystemTime() + Date date = new Date(); + if(redis.equals("eshop-redis-sim")){ + return new SystemTime() .setYear(date.getYear()+1900) .setMonth(date.getMonth()+1) .setDate(date.getDate()) @@ -158,20 +187,40 @@ public class TimeServiceConstant { .setMinute(date.getMinutes()) .setSecond(date.getSeconds()) .setTimestamp(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date)); - return systemTime; + } + try{ + + String timestamp = this.signTimeStamp(data); + TSAVerifyResult verifyResult = this.verifyTimeStamp(timestamp); + date = verifyResult.getSignedTime(); + }catch (Exception e){ log.error("获取时间戳异常", e); } - return null; + SystemTime systemTime = new SystemTime() + .setYear(date.getYear()+1900) + .setMonth(date.getMonth()+1) + .setDate(date.getDate()) + .setHour(date.getHours()) + .setMinute(date.getMinutes()) + .setSecond(date.getSeconds()) + .setTimestamp(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date)); + return systemTime; } public static void main(String arge[]){ - Date date = new Date(); - System.out.println("-----------"+(date.getYear()+1900)); - System.out.println("-----------"+(date.getMonth()+1)); - System.out.println("-----------"+date.getDate()); - System.out.println("-----------"+date.getHours()); - System.out.println("-----------"+date.getMinutes()); - System.out.println("-----------"+date.getSeconds()); + try{ + + Date date = new Date(); + System.out.println("-----------"+(date.getYear()+1900)); + System.out.println("-----------"+(date.getMonth()+1)); + System.out.println("-----------"+date.getDate()); + System.out.println("-----------"+date.getHours()); + System.out.println("-----------"+date.getMinutes()); + System.out.println("-----------"+date.getSeconds()); + + }catch (Exception e){ + e.printStackTrace(); + } } } From 4f3863f36ca66a1db4c91bd47dfe5381f369b8e3 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Fri, 16 Jul 2021 14:22:05 +0800 Subject: [PATCH 20/40] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../timeService/TimeServiceConstant.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java index 412992f..4235139 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java @@ -14,13 +14,8 @@ import org.springframework.core.io.ClassPathResource; import java.io.InputStream; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.Properties; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; @Slf4j public class TimeServiceConstant { @@ -28,7 +23,7 @@ public class TimeServiceConstant { public static TSAClient client; @Value("${spring.redis.sentinel.master}") - private String redis="eshop-redis"; + private String redis; public TimeServiceConstant(){ try{ @@ -52,7 +47,7 @@ public class TimeServiceConstant { * @return 时间戳加密原文 */ public String signTimeStamp(String data){ - if(redis.equals("eshop-redis-sim")){ + if(redis!=null&&redis.equals("eshop-redis-sim")){ return ""; } try{ @@ -79,7 +74,7 @@ public class TimeServiceConstant { public TtsAgent.TtsParseResult verifyTimeStamp2(String timestamp){ String systemtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); TtsAgent.TtsParseResult ttsParseResult = new TtsAgent.TtsParseResult(systemtime,"",""); - if(redis.equals("eshop-redis-sim")){ + if(redis!=null&&redis.equals("eshop-redis-sim")){ return ttsParseResult; } try{ @@ -116,7 +111,7 @@ public class TimeServiceConstant { public TtsAgent.TtsParseResult getServiceTimeObj(String data){ String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); TtsAgent.TtsParseResult ttsParseResult = new TtsAgent.TtsParseResult(time,"",""); - if(redis.equals("eshop-redis-sim")){ + if(redis!=null&&redis.equals("eshop-redis-sim")){ return ttsParseResult; } try{ @@ -135,8 +130,9 @@ public class TimeServiceConstant { * @return 时间 */ public String getServiceTime(String data){ + log.info("-------------------redis-"+redis); String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - if(redis.equals("eshop-redis-sim")){ + if(redis!=null&&redis.equals("eshop-redis-sim")){ return time; } try{ @@ -157,7 +153,7 @@ public class TimeServiceConstant { * @return date时间 */ public Date getServiceDate(String data){ - if(redis.equals("eshop-redis-sim")){ + if(redis!=null&&redis.equals("eshop-redis-sim")){ return new Date(); } try{ @@ -178,7 +174,7 @@ public class TimeServiceConstant { */ public SystemTime getServiceSystemTime(String data){ Date date = new Date(); - if(redis.equals("eshop-redis-sim")){ + if(redis!=null&&redis.equals("eshop-redis-sim")){ return new SystemTime() .setYear(date.getYear()+1900) .setMonth(date.getMonth()+1) From 80e7867b2424a4391a9637e7844474c52b9920f5 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Fri, 16 Jul 2021 15:04:01 +0800 Subject: [PATCH 21/40] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../timeService/TimeServiceConstant.java | 2 ++ .../controller/TimeServiceController.java | 28 +++++++++++-------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java index 4235139..45a6fde 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java @@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.binary.Base64; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.ClassPathResource; +import org.springframework.stereotype.Service; import java.io.InputStream; import java.text.SimpleDateFormat; @@ -18,6 +19,7 @@ import java.util.Date; import java.util.Properties; @Slf4j +@Service public class TimeServiceConstant { public static TSAClient client; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/controller/TimeServiceController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/controller/TimeServiceController.java index 3720306..75c48e8 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/controller/TimeServiceController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/controller/TimeServiceController.java @@ -2,6 +2,7 @@ package com.chinaunicom.mall.ebtp.extend.timeService.controller; import cn.com.jit.tsa.client.TSAVerifyResult; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.templatewarehouse.sevice.BizBidTemplateWarehouseService; import com.chinaunicom.mall.ebtp.extend.timeService.TimeServiceConstant; import com.chinaunicom.mall.ebtp.extend.timeService.tsa.SystemTime; import com.chinaunicom.mall.ebtp.extend.timeService.tsa.TtsAgent; @@ -11,6 +12,7 @@ import io.swagger.annotations.ApiParam; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; @@ -21,6 +23,8 @@ import java.util.Date; @RequestMapping("/v1/timeService") public class TimeServiceController { + @Resource + private TimeServiceConstant timeServiceConstant; /** * 申请时间戳 * @param data 待申请时间戳的原文 @@ -29,8 +33,8 @@ public class TimeServiceController { @ApiOperation("申请时间戳") @GetMapping(value = "/signTimeStamp") public BaseResponse signTimeStamp(@ApiParam(value = "待申请时间戳的原文", required = false) @RequestParam(name = "data",required = false) String data) { - TimeServiceConstant constant = new TimeServiceConstant(); - return BaseResponse.success(constant.signTimeStamp(data)); + //TimeServiceConstant constant = new TimeServiceConstant(); + return BaseResponse.success(timeServiceConstant.signTimeStamp(data)); } /** @@ -41,8 +45,8 @@ public class TimeServiceController { @ApiOperation("解析时间戳加密原文") @PostMapping(value = "/verifyTimeStamp") public BaseResponse verifyTimeStamp(@ApiParam(value = "时间戳加密原文", required = true) @RequestBody String timestamp) { - TimeServiceConstant constant = new TimeServiceConstant(); - return BaseResponse.success(constant.verifyTimeStamp2(timestamp)); + //TimeServiceConstant constant = new TimeServiceConstant(); + return BaseResponse.success(timeServiceConstant.verifyTimeStamp2(timestamp)); } /** @@ -53,8 +57,8 @@ public class TimeServiceController { @ApiOperation("直接获取时间戳对象（内涵日期）") @GetMapping(value = "/getServiceTimeObj") public BaseResponse getServiceTimeObj(@ApiParam(value = "待申请时间戳的原文", required = false) @RequestParam(name = "data",required = false) String data) { - TimeServiceConstant constant = new TimeServiceConstant(); - return BaseResponse.success(constant.getServiceTimeObj(data)); + //TimeServiceConstant constant = new TimeServiceConstant(); + return BaseResponse.success(timeServiceConstant.getServiceTimeObj(data)); } /** * 直接获取获取时间戳 @@ -64,8 +68,8 @@ public class TimeServiceController { @ApiOperation("直接获取日期字符串") @GetMapping(value = "/getServiceTime") public BaseResponse getServiceTime(@ApiParam(value = "待申请时间戳的原文", required = false) @RequestParam(name = "data",required = false) String data) { - TimeServiceConstant constant = new TimeServiceConstant(); - return BaseResponse.success(constant.getServiceTime(data)); + //TimeServiceConstant constant = new TimeServiceConstant(); + return BaseResponse.success(timeServiceConstant.getServiceTime(data)); } /** * 获取年月日时分秒分割存储对象 @@ -75,8 +79,8 @@ public class TimeServiceController { @ApiOperation("获取日期对象SystemTime") @GetMapping(value = "/getServiceSystemTime") public BaseResponse getServiceSystemTime(@ApiParam(value = "待申请时间戳的原文", required = false) @RequestParam(name = "data",required = false) String data) { - TimeServiceConstant constant = new TimeServiceConstant(); - return BaseResponse.success(constant.getServiceSystemTime(data)); + //TimeServiceConstant constant = new TimeServiceConstant(); + return BaseResponse.success(timeServiceConstant.getServiceSystemTime(data)); } /** * 获取开标剩余时间倒数 @@ -88,9 +92,9 @@ public class TimeServiceController { public BaseResponse getDescOpenRoomTime(@RequestParam(name = "openTime",required = true) String openTime){ try { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - TimeServiceConstant constant = new TimeServiceConstant(); + //TimeServiceConstant constant = new TimeServiceConstant(); - Date now = constant.getServiceDate("getDescOpenRoomTime");;//当前时间 + Date now = timeServiceConstant.getServiceDate("getDescOpenRoomTime");;//当前时间 Date date = df.parse(openTime);//过去 long l = date.getTime()-now.getTime(); long day = l / (24 * 60 * 60 * 1000); From ceab4ff32f1c9c9495ebda07fe181d8dd272052b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Fri, 16 Jul 2021 15:44:03 +0800 Subject: [PATCH 22/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9post?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BizMessageConsumerController.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java index 55b6124..22ac44a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java @@ -5,12 +5,7 @@ import java.util.Optional; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage; @@ -40,7 +35,7 @@ public class BizMessageConsumerController { * @return */ @ApiOperation("消息概要清单.") - @GetMapping("describeSiteMsg") + @PostMapping("describeSiteMsg") @ResponseStatus(code = HttpStatus.OK) public IBizMessagePage describeSiteMsg( @ApiParam(value = "分页参数", required = false) @RequestBody(required = false) PageDTO page) { From 73d2d2e80793d280e13bf94f65434ae4481ec8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Wed, 4 Aug 2021 13:59:01 +0800 Subject: [PATCH 23/40] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-sim.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/application-sim.yml b/src/main/resources/application-sim.yml index df8001f..aa507b5 100644 --- a/src/main/resources/application-sim.yml +++ b/src/main/resources/application-sim.yml @@ -163,6 +163,7 @@ mconfig: rsms: biz-service-ebtp-rsms #评审结构化服务 tender: biz-service-ebtp-tender #投标服务 documentcenter: core-service-document-center #文档中心 + usercenter: core-service-usercenter-public #用户中心 document: clientHttpUrl: http://10.242.31.54:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749 From 8f69b8edbe09243f6ee992f7a9d3ef371b12dba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Fri, 27 Aug 2021 11:04:38 +0800 Subject: [PATCH 24/40] =?UTF-8?q?=E6=89=93=E5=88=86=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E8=A1=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/export/service/impl/DfhzExportServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/DfhzExportServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/DfhzExportServiceImpl.java index 50639d4..854ade2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/DfhzExportServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/DfhzExportServiceImpl.java @@ -218,9 +218,11 @@ public class DfhzExportServiceImpl implements ExportService { BidEvalDetailSummaryVO detailSummary = detailScore.stream().filter(f -> f.getSupplierRegisterId().equals(vo.getId())).findFirst().orElseGet(BidEvalDetailSummaryVO::new); Map memberScoreMap = detailSummary.getScoreMap(); for (JuryPrintVO memberVO : memberAll) { - if (memberScoreMap.containsKey(memberVO.getUserId())) { + if (memberScoreMap != null && memberScoreMap.containsKey(memberVO.getUserId())) { BigDecimal score = memberScoreMap.get(memberVO.getUserId()).getScore(); this.createCell(row, cellIndex++, cellStyle, score == null ? "" : String.valueOf(score)); + }else { + this.createCell(row, cellIndex++, cellStyle, ""); } } } From 3716e2ca816b00855bbc411807f033b95cfc6d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Fri, 27 Aug 2021 11:11:42 +0800 Subject: [PATCH 25/40] =?UTF-8?q?=E6=89=93=E5=88=86=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E8=A1=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/extend/export/service/impl/DfhzExportServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/DfhzExportServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/DfhzExportServiceImpl.java index 854ade2..5f368ac 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/DfhzExportServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/DfhzExportServiceImpl.java @@ -221,8 +221,6 @@ public class DfhzExportServiceImpl implements ExportService { if (memberScoreMap != null && memberScoreMap.containsKey(memberVO.getUserId())) { BigDecimal score = memberScoreMap.get(memberVO.getUserId()).getScore(); this.createCell(row, cellIndex++, cellStyle, score == null ? "" : String.valueOf(score)); - }else { - this.createCell(row, cellIndex++, cellStyle, ""); } } } From 1ffcb167f9f489bff8407303e5a5643207cd61e6 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Tue, 14 Sep 2021 11:23:48 +0800 Subject: [PATCH 26/40] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CrypConfigureServiceImpl.java | 12 +++++++----- src/main/resources/bidding.crt | 17 +++++++++++++++++ src/main/resources/bidding_certPrivate.pem | 5 +++++ 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/bidding.crt create mode 100644 src/main/resources/bidding_certPrivate.pem 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..fb09e74 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 @@ -54,11 +54,12 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Tue, 14 Sep 2021 11:29:34 +0800 Subject: [PATCH 27/40] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 fb09e74..1d67a80 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 @@ -208,8 +208,8 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Wed, 15 Sep 2021 10:58:48 +0800 Subject: [PATCH 28/40] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E6=A0=B9?= =?UTF-8?q?=E6=8D=AEmconfig.bss.app-secret=20=E4=BF=AE=E6=94=B9=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CrypConfigureServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 1d67a80..5484cb9 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 @@ -78,6 +78,13 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Wed, 15 Sep 2021 11:07:17 +0800 Subject: [PATCH 29/40] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E6=A0=B9?= =?UTF-8?q?=E6=8D=AEmconfig.bss.app-secret=20=E4=BF=AE=E6=94=B9=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CrypConfigureServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 5484cb9..c7e4f6d 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 @@ -65,6 +65,10 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Wed, 15 Sep 2021 11:14:01 +0800 Subject: [PATCH 30/40] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E6=A0=B9?= =?UTF-8?q?=E6=8D=AEmconfig.bss.app-secret=20=E4=BF=AE=E6=94=B9=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CrypConfigureServiceImpl.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) 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 c7e4f6d..b353849 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 @@ -212,15 +212,21 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Wed, 15 Sep 2021 11:20:31 +0800 Subject: [PATCH 31/40] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E6=A0=B9?= =?UTF-8?q?=E6=8D=AEmconfig.bss.app-secret=20=E4=BF=AE=E6=94=B9=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 b353849..44e0fe6 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 @@ -85,6 +85,8 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Wed, 15 Sep 2021 14:46:31 +0800 Subject: [PATCH 32/40] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/access_token1.3.jar | Bin 0 -> 12547 bytes pom.xml | 4 +- .../impl/CrypConfigureServiceImpl.java | 63 ++++++++++++------ 3 files changed, 43 insertions(+), 24 deletions(-) create mode 100644 lib/access_token1.3.jar diff --git a/lib/access_token1.3.jar b/lib/access_token1.3.jar new file mode 100644 index 0000000000000000000000000000000000000000..dc162fcfe7f1f232f1e5d10034e93e1c024a1e1a GIT binary patch literal 12547 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 literal 0 HcmV?d00001 diff --git a/pom.xml b/pom.xml index 1474efd..31bcbf8 100644 --- a/pom.xml +++ b/pom.xml @@ -98,9 +98,9 @@ cryp.access accessToken - 1.0 + 1.3 system - ${basedir}/lib/access_token1.1.jar + ${basedir}/lib/access_token1.3.jar 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 b353849..71959cc 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.*; @@ -165,7 +159,7 @@ 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){ @@ -276,10 +270,36 @@ 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> list = new ArrayList>(); + Iterator it = ((JSONArray)v).iterator(); + while (it.hasNext()){ + Object json2 = it.next(); + list.add(parseJSON2Map(json2.toString())); + } + map.put(k.toString(),list); + }else{ + map.put(k.toString(),v); + } + } + return map; + } + public static void main(String[] args) throws ClassNotFoundException, IllegalAccessException, InstantiationException, UnsupportedEncodingException { -// String token = AccessToken.tokenCreate("123"); -// System.out.println(token); + //String json = "{\"RESULT_ID\":\"1\",\"TP_ID\":\"2\",\"SECTION_ID\":\"3\",\"REPORT_ID\":\"4\",\"RESULTDETAIL\":[{\"RESULT_DETAIL_ID\":\"51\",\"RESULT_ID\":\"52\",\"TENDERER_ID\":\"53\",\"WINNER_CANDIDATE\":\"54\",\"PRICE\":\"55\",\"PRICE_REVIEW\":\"56\",\"BUSINESS_SCORE\":\"57\",\"TECHNICAL_SCORE\":\"58\",\"SERVICE_SCORE\":\"59\",\"PRICE_SCORE\":\"60\",\"TOTAL_SCORE\":\"61\",\"CONTRACTED_MONEY\":\"62\",\"TAX_RATE_PRICE\":\"63\",\"SCOREDETAIL\":[{\"RESULT_DETAIL_ID\":\"71\",\"TENDERER_ID\":\"72\",\"USER_ID\":\"73\",\"BUSINESS_SCORE\":\"74\",\"TECHNICAL_SCORE\":\"75\",\"SERVICE_SCORE\":\"76\",\"PRICE_SCORE\":\"77\"}]}]}"; + + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //format.setTimeZone(TimeZone.getTimeZone("GMT")); + String date = format.format(new Date()); + + String token = AccessToken.tokenCreate("bidding"); + System.out.println(token); // example of HashMap entity, treeMap can also work out, // but LinkedHashMap is NOT supported // Map mapb= new HashMap<>(); @@ -294,25 +314,24 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Wed, 15 Sep 2021 15:07:27 +0800 Subject: [PATCH 33/40] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 41fe2f9..2ea0513 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 @@ -218,6 +218,8 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Wed, 15 Sep 2021 15:59:16 +0800 Subject: [PATCH 34/40] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 2ea0513..b63c213 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 @@ -236,8 +236,8 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Thu, 16 Sep 2021 09:45:08 +0800 Subject: [PATCH 35/40] =?UTF-8?q?UAT=E5=8C=BA=E5=9D=97=E9=93=BE=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 b63c213..9f6cbd7 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 @@ -85,6 +85,9 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Thu, 16 Sep 2021 10:00:55 +0800 Subject: [PATCH 36/40] =?UTF-8?q?UAT=E5=8C=BA=E5=9D=97=E9=93=BE=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crypconfigure/service/impl/CrypConfigureServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 9f6cbd7..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 @@ -82,6 +82,8 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl Date: Thu, 21 Oct 2021 08:36:04 +0800 Subject: [PATCH 37/40] =?UTF-8?q?=E8=84=9A=E6=89=8B=E6=9E=B6v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 40 ++-------------------------------------- 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/pom.xml b/pom.xml index 31bcbf8..90ddf40 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,52 +20,16 @@ com.chinaunicom.mall.ebtp uboot-core - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT - - com.chinaunicom.ebtp - mall-ebtp-cloud-attachment-sdk - - - - com.chinaunicom.ebtp - mall-ebtp-cloud-apollo-starter - - - mysql - mysql-connector-java - - - - org.apache.shardingsphere - sharding-jdbc-spring-boot-starter - - com.deepoove poi-tl 1.9.1 - - - org.apache.poi - poi - 4.1.2 - - - org.apache.poi - poi-ooxml - 4.1.2 - - - - org.apache.poi - poi-ooxml-schemas - 4.1.2 - commons-httpclient commons-httpclient From 5b6ff0dba3598cf01690a47d4b53cc9e5dff260d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Mon, 25 Oct 2021 10:29:03 +0800 Subject: [PATCH 38/40] =?UTF-8?q?=E3=80=90=E7=94=9F=E4=BA=A7=E3=80=91?= =?UTF-8?q?=E6=9C=AA=E8=BF=9B=E5=85=A5=E8=AF=84=E5=AE=A1=E5=AE=A4=E7=9A=84?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=EF=BC=8C=E4=B8=8D=E5=BA=94=E5=9C=A8?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=89=93=E5=8D=B0=E9=87=8C=E5=87=BA=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/feign/client/TenderFeignService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/TenderFeignService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/TenderFeignService.java index 753aeab..39b0b90 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/TenderFeignService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/TenderFeignService.java @@ -18,7 +18,7 @@ import java.util.List; public interface TenderFeignService { @ApiOperation("查询评审室下初审投标状态") - @GetMapping("/v1/supplier_register/room/tender/{roomId}") + @GetMapping("/v1/supplier_register/tender/count/{roomId}") BaseResponse> queryRoomTenderCount(@ApiParam(value = "评审室id", required = true) @PathVariable String roomId); } From 809caa25e7e3fccd764115bc544926d0dd70fcaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Mon, 25 Oct 2021 11:07:57 +0800 Subject: [PATCH 39/40] =?UTF-8?q?=E6=9C=AA=E8=BF=9B=E5=85=A5=E8=AF=84?= =?UTF-8?q?=E5=AE=A1=E5=AE=A4=E7=9A=84=E4=BE=9B=E5=BA=94=E5=95=86=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=BA=94=E5=9C=A8=E6=8A=A5=E8=A1=A8=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E9=87=8C=E5=87=BA=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/feign/client/TenderFeignService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/TenderFeignService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/TenderFeignService.java index 39b0b90..9c288bf 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/TenderFeignService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/TenderFeignService.java @@ -18,7 +18,7 @@ import java.util.List; public interface TenderFeignService { @ApiOperation("查询评审室下初审投标状态") - @GetMapping("/v1/supplier_register/tender/count/{roomId}") + @GetMapping("v1/supplier_register/room/downloaded/{roomId}") BaseResponse> queryRoomTenderCount(@ApiParam(value = "评审室id", required = true) @PathVariable String roomId); } From 8d22ec7ef075a7f6a715ea4207bb050e55f6676e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Mon, 25 Oct 2021 15:39:23 +0800 Subject: [PATCH 40/40] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AEtoken?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserInfoController.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/controller/UserInfoController.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/controller/UserInfoController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/controller/UserInfoController.java new file mode 100644 index 0000000..0489224 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/controller/UserInfoController.java @@ -0,0 +1,39 @@ +package com.chinaunicom.mall.ebtp.extend.userinfo.controller; + +import com.chinaunicom.mall.ebtp.cloud.userinfo.starter.service.UserInfoService; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Slf4j +@RestController +@RequestMapping("/v1/userinfo/") +public class UserInfoController { + + @Autowired + private UserInfoService service; + + /** + * 获取用户信息 + * + * @param token (认证token) + * @return + */ + @GetMapping("get") + public ResponseEntity getUserInfo( + @RequestHeader(name = "Authorization", required = false) String token) { + if (StringUtils.isEmpty(token)) { + log.error("access token is empty"); + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build(); + } + return ResponseEntity.ok(service.getUserInfo(token)); + } + +}