Merge remote-tracking branch 'origin/develop' into develop

.github/workflows/alibabacloud.yml

+name: Build and Push to ACR
+
+on:
+  push:
+    branches: [ "develop" ]
+
+env:
+  REGION_ID: cn-shenzhen
+  REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
+  NAMESPACE: sharefly
+  IMAGE: ims
+  TAG: ${{ github.sha }}
+
+  ACR_EE_REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
+  ACR_EE_INSTANCE_ID: cri-yhk5zgfc2v1sia6l
+  ACR_EE_NAMESPACE: sharefly
+  ACR_EE_IMAGE: ims
+  ACR_EE_TAG: ${{ github.sha }}
+  JAVA_VERSION: '8'
+  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/ims.git
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    environment: dev
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{env.JAVA_VERSION}}
+
+      - name: Login to ACR EE with the AccessKey pair
+        uses: aliyun/acr-login@v1
+        with:
+          login-server: "https://${{ env.ACR_EE_REGISTRY }}"
+          region-id: "${{ env.REGION_ID }}"
+          username: "QD--KeBiTeHangKong@1354706964800968"
+          password: "MMC@2023&ACR"
+          instance-id: "${{ env.ACR_EE_INSTANCE_ID }}"
+
+      - name: Build and push image to ACR EE
+        run: |
+          mvn clean package
+          docker build -t "$ACR_EE_REGISTRY/$ACR_EE_NAMESPACE/$ACR_EE_IMAGE:$TAG" .
+          docker push "$ACR_EE_REGISTRY/$ACR_EE_NAMESPACE/$ACR_EE_IMAGE:$TAG"
+
+      - name: Kustomize Set Image
+        run: |-
+          cd kustomization/overlays/dev
+          curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash /dev/stdin 3.8.6
+          ./kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
+
+      - name: Commit and Push
+        run: |
+          git config user.name "Chuck"
+          git config user.email "Chuck@users.noreply.github.com"
+          git remote set-url origin "$GITLAB_URL"
+          git commit -am "generated Image update"
+          git push origin develop
\ No newline at end of file

Dockerfile

+FROM openjdk:8-jdk-alpine
+#VOLUME ["/tmp","/files","/var/logs/"]
+ARG JAVA_OPTS
+ENV JAVA_OPTS=$JAVA_OPTS
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+COPY ./release-service/target/release-service-0.0.1-SNAPSHOT.jar ims.jar
+EXPOSE 10001
+
+# For Spring-Boot project, use the entrypoint below to reduce Tomcat startup time.
+ENTRYPOINT exec java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar ims.jar

kustomization/application.yaml

+# application.yaml
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: ims-application
+  namespace: argocd
+spec:
+  project: default # 项目名
+  source:
+    repoURL: http://git.mmcuav.cn/iuav/ims.git
+    targetRevision: HEAD #develop master # 分支名
+    path: kustomization/overlays/dev  # 资源文件路径
+  destination:
+    server: https://kubernetes.default.svc  # API Server 地址
+    namespace: dev # 部署应用的命名空间
+  #  默认情况下每 3 分钟会检测 Git 仓库一次
+  syncPolicy:
+    syncOptions:
+      - CreateNamespace=true
+    automated:
+      selfHeal: true
+      prune: true

kustomization/base/configMap.yaml

+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ims-map
+  namespace: default
+data:
+  SPRING_PROFILES_ACTIVE: default

kustomization/base/deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ims-deployment
+  namespace: default
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: ims
+  template:
+    metadata:
+      labels:
+        app: ims
+    spec:
+      containers:
+        - name: ims
+          image: REGISTRY/NAMESPACE/IMAGE:TAG
+          resources:
+            limits:
+              memory: 2048Mi
+              cpu: 100m
+          ports:
+            - containerPort: 10001
+          env:
+            - name: SPRING_PROFILES_ACTIVE
+              valueFrom:
+                configMapKeyRef:
+                  name: ims-map
+                  key: SPRING_PROFILES_ACTIVE
\ No newline at end of file

kustomization/base/ingress.yaml

+#apiVersion: extensions/v1beta1
+#kind: Ingress
+#metadata:
+#  name: pms-ingress
+#  namespace: default
+#spec:
+#  rules:
+#    - host: infra.mmcuav.cn
+#      http:
+#        paths:
+#          - backend:
+#              serviceName: pms-svc
+#              servicePort: 8081
+#            path: /
\ No newline at end of file

kustomization/base/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+commonLabels:
+  app: ims
+resources:
+  - ./deployment.yaml
+  - ./service.yaml
+  - ./configMap.yaml
\ No newline at end of file

kustomization/base/service.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  name: ims-svc
+  namespace: default
+spec:
+  selector:
+    app: ims
+  type: NodePort
+  ports:
+    - protocol: TCP
+      port: 10001
\ No newline at end of file

kustomization/overlays/dev/configMap.yaml

+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ims-map
+data:
+  SPRING_PROFILES_ACTIVE: dev
\ No newline at end of file

kustomization/overlays/dev/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../base
+#namePrefix: dev-
+namespace: dev
+commonLabels:
+  variant: dev
+commonAnnotations:
+  note: This is dev!
+patches:
+- path: ./configMap.yaml
+- path: ./service.yaml
+images:
+- name: REGISTRY/NAMESPACE/IMAGE:TAG
+  newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/ims
+  newTag: 109477f7d1e12814d3d28600cda6c90e3ce66713

kustomization/overlays/dev/service.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  name: ims-svc
+  namespace: default
+spec:
+  selector:
+    app: ims
+  type: NodePort
+  ports:
+    - protocol: TCP
+      port: 10001
+      nodePort: 30001
\ No newline at end of file

kustomization/overlays/prod/configMap.yaml

+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ims-map
+data:
+  SPRING_PROFILES_ACTIVE: prod
\ No newline at end of file

kustomization/overlays/prod/kustomization.yaml

+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../base
+namespace: prod
+#namePrefix: prod-
+commonLabels:
+  variant: prod
+commonAnnotations:
+  note: This is prod!
+patches:
+  - configMap.yaml
\ No newline at end of file

release-service/src/main/resources/application-test.yml

+#Application
+server:
+  port: 10001
+  servlet:
+    context-path: /release
+#spring
+spring:
+  application:
+    name: release
+    #Database
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://rm-wz9dd796t4j1giz6t.mysql.rds.aliyuncs.com:3306/iuav_ims?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+    username: tmj
+    password: MMC@2022&MYSQL
+    #   Druid数据源配置
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      initial-size: 1     #初始化连接池大小
+      min-idle: 1         #最小大小
+      max-active: 1       #最大大小
+      max-wait: 60000      #获取连接时最大等待时间，单位毫秒
+      time-between-eviction-runs-millis: 60000   #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      min-evictable-idle-time-millis: 300000     #配置一个连接在池中最小生存的时间，单位是毫秒
+      validation-query: SELECT 1 FROM DUAL       #用来检测连接是否有效的sql
+      test-while-idle: true                      #申请连接的时候检测，建议配置为true，不影响性能，并且保证安全性
+      testOnBorrow: false                        #获取连接时执行检测，建议关闭，影响性能
+      testOnReturn: false                        #归还连接时执行检测，建议关闭，影响性能
+      pool-prepared-statements: false            #是否开启PSCache，PSCache对支持游标的数据库性能提升巨大，oracle建议开启，mysql下建议关闭
+      filters: stat,wall                   #配置扩展插件，常用的插件有=>stat:监控统计  log4j:日志  wall:防御sql注入
+      filter:
+        wall:
+          config:
+            multi-statement-allow: true
+          db-type: mysql
+          enabled: true
+      connection-properties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000   #打开慢sql记录和延迟时间
+      web-stat-filter:
+        url-pattern: /*
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+        enabled: true
+      stat-view-servlet:
+        enabled: true
+        login-username: druid
+        login-password: druid
+  #cloud
+  cloud:
+    loadbalancer:
+      retry:
+        enabled: true
+  #Redis
+  redis:
+    database: 0
+    host: 119.23.248.181
+    password: mmc@redis123
+    port: 6379
+    #连接池
+    lettuce:
+      shutdown-timeout: 1000 # 关闭超时时间-ms
+      pool:
+        #最大连接个数
+        max-active: 30
+        #等待时间-ms
+        max-wait: 1000ms
+        #最大空闲
+        max-idle: 8
+        #初始化最小
+        min-idle: 1
+  #rabbitMQ
+  rabbitmq:
+    host: 119.23.248.181
+    port: 5672
+    username: admin
+    password: mmc123456
+    virtual-host: /
+    listener:
+      simple:
+        #acknowledge-mode: manual #设置确认模式手工确认
+        concurrency: 3 #消费者最小数量
+        max-concurrency: 10 # 消费者最大数量
+        # 一般消费者自动签收模式下可以添加下面配置，用于消费抛出异常后进行消息重新投递设置
+        retry:
+          enabled: true #是否开启消费者重试（为false时关闭消费者重试）
+          max-attempts: 3 # 最大重试重新投递消息次数
+          initial-interval: 900s #重试重新投递消息间隔时间（单位秒）
+        default-requeue-rejected: false #重试次数超过上面的设置之后是否丢弃(消费者listener抛出异常，是否重回队列，默认true：重回队列， false为不重回队列(结合死信交换机))
+
+#eureka   eureka.client.register-with-eureka=true
+eureka:
+  instance:
+    prefer-ip-address: true
+    ip-address: 127.0.0.1
+    instance-id: ${eureka.instance.ip-address}:${server.port}@${random.int}
+    status-page-url: http://${eureka.instance.ip-address}:${server.port}${server.servlet.context-path}/swagger-ui.html
+  client:
+    fetch-registry: true
+    service-url:
+      defaultZone: http://edmin:sharefly1200@127.0.0.1:20080/eureka/
+
+
+#logging
+logging:
+  level:
+    com:
+      mmc:
+        csf: DEBUG
+
+#mybatis
+mybatis:
+  executor-type: simple
+  mapper-locations: classpath:mapper/**/*.xml
+  type-aliases-package: com.mmc.csf
+  configuration:
+    map-underscore-to-camel-case: true
+
+##feign
+#feign:
+#  client:
+#    config:
+#      default:
+#        connect-timeout: 3000
+#        read-timeout: 6000
+#  #Okhttp参数配置
+#  httpclient:
+#    enabled: false
+#  okhttp:
+#    enabled: true
+#  hystrix:
+#    enabled: true
+#hystrix:
+#  command:
+#    default:
+#      execution:
+#        isolation:
+#          thread:
+#            # hystrix 超时时间
+#            timeoutInMilliseconds: 9000
+##ribbon-ribbo和hystrix时间取最小的生效，feign和ribbon的超时时间只能选其一生效feign优先级高于ribbon
+#ribbon:
+#  okhttp:
+#    enabled: true
+
+#mmc:
+#  appid: 80001
+#  url: http://121.37.224.147
+#  companycode: MMC
+#
+##logstash服务器地址
+#logstash:
+#  host: 10.86.210.18
+##logstash端口
+#  port: 8084
+#
+#
+#wechat:
+#  sub:
+#    appid: wx5c6a105a0ddca4c5
+#    secret: 96c75255dd26f82f8d55e15b59e101c7
+#
+#rabbitmq:
+#  enabled: false
+#  exchange: REPOORDER_WX_API_DIRECT_DEV
+#
+## 查看健康情况-开发分支配置则可-其余分支请勿配置
+#management:
+#  endpoints:
+#    web:
+#      exposure:
+#        include: "*"
\ No newline at end of file

release-service/src/main/resources/application.yml

 spring:
   profiles:
-    active: dev
-    
+    active: test
+
 ---
 
 spring:
   profiles: dev
-  
+
 ---
 
 spring: