Merge branch 'master' of http://git.hobbystocks.cn/AHX-Bid/deployments

AuctionApp/DEV/Order/Jenkinsfile

@@ -1,30 +0,0 @@
-node {
-    // Git checkout before load source the file
-    checkout scm
-    // sh '''
-    //     ls -lhrt
-    // '''
-    def base_branch = ref.tokenize('/')[2]
-    def rootDir = pwd()
-    def yaml2Map = load "./sharedLibs/yaml2Map.groovy"
-    def stages = load "./sharedLibs/stages.groovy"
-    def GLOBAL_CONFIG = yaml2Map.read('global.yaml').project
-    dir("AuctionApp/DEV/Order") {
-        def PROJECT_CONFIG = yaml2Map.read('cfg.yaml').project
-        def CONFIG = yaml2Map.merge(PROJECT_CONFIG, GLOBAL_CONFIG)
-        CONFIG.docker.image = String.format(CONFIG.docker.image, CONFIG.service.name)
-        println 'configs: ' + CONFIG
-        
-        String[] JAVA_ARGS = ["-Djava.security.egd=file:/dev/./urandom",
-            "-Xmx1024m",
-            "-Dspring.profiles.active=dev",
-            "-Dserver.port=80",
-            "-jar","/app/target/${CONFIG.service.jar}"]
-        stages.execute(CONFIG, base_branch, [
-            'K3SDEPLOY' : {
-                stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, './configmap-env.ini',"ahxpm")
-                stages.applyService(CONFIG.service, CONFIG.k3s, base_branch)
-            }
-        ])
-    }
-}

AuctionApp/DEV/Order/cfg.yaml

@@ -1,12 +0,0 @@
-project:
-  git:
-    address: http://git.hobbystocks.cn/auction/auction.git
-    credentialId: gogs.hobbystocks.cn
-  service:
-    name: auction-order
-    version: ''
-    jar: txmall-order.jar
-    module: txmall-order
-    health: /actuator/health/readiness
-  k3s:
-    kubeconfig: k3s/k3s-dev3.yaml

AuctionApp/DEV/Order/configmap-env.ini

@@ -1,22 +0,0 @@
-spring.datasource.url=jdbc:mysql://192.168.56.105:3306/auction-order?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-spring.datasource.username=auction
-spring.datasource.password=Pass2022
-
-spring.redis.database=2
-spring.redis.password=Pass2010
-spring.redis.sentinel.master=poyee-master
-spring.redis.sentinel.nodes=192.168.56.105:26379
-
-order.payNotifyUrl=http://auction-order/internal/notify
-order.payUrl=http://auction-pay/internal/makeOrder
-order.chkPayUrl=http://auction-pay/internal/chkPay
-order.aucPaidUrl=http://auction-auc/internal/lot/paid
-order.getLotDepositUrl=http://auction-auc/internal/lot/getDepositForOrder
-order.deductDepositAmountUrl=http://auction-deposit/internal/lot/deduct
-order.getDepositAmountUrl=http://auction-deposit/internal/lot/getAmount
-order.getUserUrl=https://sso.txmall.zcunsoft.com/api/backend/getInfo
-
-logging.fluentd.enabled=true
-logging.fluentd.host=192.168.56.105
-logging.fluentd.port=24224
-logging.console.enabled=true

AuctionApp/DEV/Order/deployment.yaml

@@ -1,38 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: <service_name><service_version>
-  namespace: default
-spec:
-  selector:
-    matchLabels:
-      app: <service_name><service_version>
-      release: <release>
-  template:
-    metadata:
-      labels:
-        app: <service_name><service_version>
-        release: <release>
-      annotations:
-        commit-sha: "<COMMIT_SHA>"
-    spec:
-      imagePullSecrets:
-      - name: <imagePullSecret>
-      containers:
-      - name: <service_name>
-        image: <docker_image>
-        command: ["java"]
-        args: <java_args>
-        readinessProbe:
-          httpGet:
-            path: <service_health>
-            port: 80
-          initialDelaySeconds: 15
-          periodSeconds: 30
-          failureThreshold: 3
-        ports:
-        - name: http
-          containerPort: 80
-        envFrom:
-        - configMapRef:
-            name: <configmap_env_name>

AuctionApp/DEV/Order/service.yaml

@@ -1,12 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: <service_name><service_version>
-spec:
-  selector:
-    app: <service_name><service_version>
-    release: <release>
-  ports:
-  - port: 80
-    targetPort: 80

AuctionApp/DEV/Pay/Jenkinsfile

@@ -1,30 +0,0 @@
-node {
-    // Git checkout before load source the file
-    checkout scm
-    // sh '''
-    //     ls -lhrt
-    // '''
-    def base_branch = ref.tokenize('/')[2]
-    def rootDir = pwd()
-    def yaml2Map = load "./sharedLibs/yaml2Map.groovy"
-    def stages = load "./sharedLibs/stages.groovy"
-    def GLOBAL_CONFIG = yaml2Map.read('global.yaml').project
-    dir("AuctionApp/DEV/Pay") {
-        def PROJECT_CONFIG = yaml2Map.read('cfg.yaml').project
-        def CONFIG = yaml2Map.merge(PROJECT_CONFIG, GLOBAL_CONFIG)
-        CONFIG.docker.image = String.format(CONFIG.docker.image, CONFIG.service.name)
-        println 'configs: ' + CONFIG
-        
-        String[] JAVA_ARGS = ["-Djava.security.egd=file:/dev/./urandom",
-            "-Xmx1024m",
-            "-Dspring.profiles.active=dev",
-            "-Dserver.port=80",
-            "-jar","/app/target/${CONFIG.service.jar}"]
-        stages.execute(CONFIG, base_branch, [
-            'K3SDEPLOY' : {
-                stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, './configmap-env.ini',"ahxpm")
-                stages.applyService(CONFIG.service, CONFIG.k3s, base_branch)
-            }
-        ])
-    }
-}

AuctionApp/DEV/Pay/cfg.yaml

@@ -1,12 +0,0 @@
-project:
-  git:
-    address: http://git.hobbystocks.cn/auction/auction.git
-    credentialId: gogs.hobbystocks.cn
-  service:
-    name: auction-pay
-    version: ''
-    jar: txmall-pay.jar
-    module: txmall-pay
-    health: /actuator/health/readiness
-  k3s:
-    kubeconfig: k3s/k3s-dev3.yaml

AuctionApp/DEV/Pay/configmap-env.ini

@@ -1,22 +0,0 @@
-spring.datasource.url=jdbc:mysql://192.168.56.105:3306/auction-dpst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-spring.datasource.username=auction
-spring.datasource.password=Pass2022
-
-spring.security.oauth2.resourceserver.jwt.issuer-uri=https://auth.txmall.zcunsoft.com/realms/demo
-
-spring.redis.database=2
-spring.redis.password=Pass2010
-spring.redis.sentinel.master=poyee-master
-spring.redis.sentinel.nodes=192.168.56.105:26379
-
-pay.appId=4001
-pay.secretKey=ea0df9399c2168f9fe1b02afdc7ea51b
-pay.makeOrderUrl=https://pay.test.zcunsoft.com/checkout.counter.api/order/makeOrder
-pay.makeRefundUrl=https://pay.test.zcunsoft.com/checkout.counter.api/order/makeRefund
-pay.queryOrderUrl=https://pay.test.zcunsoft.com/checkout.counter.api/order/queryOrder
-pay.notifyUrl=https://api.txmall.zcunsoft.com/pay/pub/notify
-
-logging.fluentd.enabled=true
-logging.fluentd.host=fluentd-aggr
-logging.fluentd.port=24224
-logging.console.enabled=true

AuctionApp/DEV/Pay/deployment.yaml

@@ -1,38 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: <service_name><service_version>
-  namespace: default
-spec:
-  selector:
-    matchLabels:
-      app: <service_name><service_version>
-      release: <release>
-  template:
-    metadata:
-      labels:
-        app: <service_name><service_version>
-        release: <release>
-      annotations:
-        commit-sha: "<COMMIT_SHA>"
-    spec:
-      imagePullSecrets:
-      - name: <imagePullSecret>
-      containers:
-      - name: <service_name>
-        image: <docker_image>
-        command: ["java"]
-        args: <java_args>
-        readinessProbe:
-          httpGet:
-            path: <service_health>
-            port: 80
-          initialDelaySeconds: 15
-          periodSeconds: 30
-          failureThreshold: 3
-        ports:
-        - name: http
-          containerPort: 80
-        envFrom:
-        - configMapRef:
-            name: <configmap_env_name>

AuctionApp/DEV/Pay/service.yaml

@@ -1,12 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: <service_name><service_version>
-spec:
-  selector:
-    app: <service_name><service_version>
-    release: <release>
-  ports:
-  - port: 80
-    targetPort: 80

poyee-app/DEV/Jenkinsfile

@@ -121,7 +121,6 @@ EOF
 
                                 def base_branch = "${params.BRANCH}"
                                 stages.upgrade(CONFIG, base_branch, K8S_BACKUPS, [
-                                    'POST_GITCLONE': { sh 'cp -r ../../skywalking-agent-9.0.0 projdir/skywalking-agent' },
                                     'GENERATEDOCKERFILE': {generateDockerfile()},
                                     'K3SDEPLOY' : {stages.deployWithConfigmaps(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, "./configmap-env.ini", "./configmap","ahxpm")}
                                 ])

tyz-admin/configmap-env

@@ -1,3 +0,0 @@
-FLUENTD_ENABLED=true
-FLUENTD_HOST=192.168.33.1
-FLUENTD_PORT=24225

tyz-admin/configmap/application-druid.yml

@@ -1,57 +0,0 @@
-# 数据源配置
-spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: org.postgresql.Driver
-        druid:
-            # 主库数据源
-            master:
-            #test
-#                url: jdbc:postgresql://localhost:5432/emm
-#                url: jdbc:postgresql://192.168.66.165:5432/emm
-#                username: postgres
-#                password: 123456
-                #prod
-                url: jdbc:postgresql://192.168.33.200:5432/tzy_system
-                username: root
-                password: root
-            # 初始连接数
-            initialSize: 10
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量
-            maxActive: 50
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
-            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
-            validationQuery: SELECT 1 
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            webStatFilter: 
-                enabled: true
-            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: 
-                login-password: 
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
-                        multi-statement-allow: true
-                        

tyz-admin/configmap/application.yml

@@ -1,177 +0,0 @@
-# 项目相关配置
-tzy:
-  # 名称
-  name: TzyTms
-  # 版本
-  version: 4.5.0
-  # 版权年份
-  copyrightYear: 2019
-  # 实例演示开关
-  demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/tzy/uploadPath，Linux配置 /home/tzy/uploadPath）
-  profile: /app/data/uploadPath
-#  profile: F:/tomcat/card/uploadPath
-  # 获取ip地址开关
-  addressEnabled: false
-  app-version: dev
-
-# 开发环境配置
-server:
-  # 服务器的HTTP端口，默认为80
-  port: 80
-  servlet:
-    # 应用的访问路径
-    context-path: /
-  tomcat:
-    # tomcat的URI编码
-    uri-encoding: UTF-8
-    # tomcat最大线程数，默认为200
-    max-threads: 800
-    # Tomcat启动初始化的线程数，默认值25
-    min-spare-threads: 30
- 
-# 日志配置
-logging:
-  level:
-    com.tzy: debug
-    org.springframework: warn
-  fluentd:
-    enabled: ${FLUENTD_ENABLED:false}
-    host: ${FLUENTD_HOST:127.0.0.1}
-    port: ${FLUENTD_PORT:24225}
-
-# 用户配置
-user:
-  password:
-    # 密码错误{maxRetryCount}次锁定10分钟
-    maxRetryCount: 5
-
-# Spring配置
-spring:
-#静态资源访问
-  resources:
-    static-locations: classpath:/static/,file:/home/tzy/uploadPath,file:F://tomcat//card//uploadPath
-  # 模板引擎
-  thymeleaf:
-    mode: HTML
-    encoding: utf-8
-    # 禁用缓存
-    cache: false
-  # 资源信息
-  messages:
-    # 国际化资源文件路径
-    basename: static/i18n/messages
-  jackson:
-    time-zone: GMT+8
-    date-format: yyyy-MM-dd HH:mm:ss
-  profiles: 
-    active: druid
-  # 文件上传
-  servlet:
-     multipart:
-       # 单个文件大小
-       max-file-size:  10MB
-       # 设置总上传的文件大小
-       max-request-size:  20MB
-  # 服务模块
-  devtools:
-    restart:
-      # 热部署开关
-      enabled: true
-  redis:
-      database: 1
-      host: 192.168.33.101
-      port: 6379
-      password: #Tencheer456!    # 密码（默认为空）
-
-
-      timeout: 6000  # 连接超时时长（毫秒）
-      pool:
-        max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
-        max-wait: -1ms    # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-idle: 10      # 连接池中的最大空闲连接
-        min-idle: 5       # 连接池中的最小空闲连接    
-# MyBatis
-mybatis:
-    # 搜索指定包别名
-    typeAliasesPackage: com.tzy.**.domain
-    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml
-    # 加载全局的配置文件
-    configLocation: classpath:mybatis/mybatis-config.xml
-
-# PageHelper分页插件
-pagehelper: 
-  helperDialect: postgresql
-  reasonable: true
-  supportMethodsArguments: true
-  params: count=countSql 
-
-# Shiro
-shiro:
-  user:
-    # 登录地址
-    loginUrl: /login
-    # 权限认证失败地址
-    unauthorizedUrl: /unauth
-    # 首页地址
-    indexUrl: /index
-    # 验证码开关
-    captchaEnabled: false
-    # 验证码类型 math 数组计算 char 字符
-    captchaType: math
-  cookie:
-    # 设置Cookie的域名 默认空，即当前访问的域名
-    domain: 
-    # 设置cookie的有效访问路径
-    path: /
-    # 设置HttpOnly属性
-    httpOnly: true
-    # 设置Cookie的过期时间，天为单位
-    maxAge: 30
-    # 设置密钥，务必保持唯一性（生成方式，直接拷贝到main运行即可）KeyGenerator keygen = KeyGenerator.getInstance("AES"); SecretKey deskey = keygen.generateKey(); System.out.println(Base64.encodeToString(deskey.getEncoded()));
-    cipherKey: zSyK5Kp6PZAAjlT+eeNMlg==
-  session:
-    # Session超时时间，-1代表永不过期（默认30分钟）
-    expireTime: 480
-    # 同步session到数据库的周期（默认1分钟）
-    dbSyncPeriod: 1
-    # 相隔多久检查一次session的有效性，默认就是10分钟
-    validationInterval: 10
-    # 同一个用户最大会话数，比如2的意思是同一个账号允许最多同时两个人登录（默认-1不限制）
-    maxSession: -1
-    # 踢出之前登录的/之后登录的用户，默认踢出之前登录的用户
-    kickoutAfter: false
-
-# 防止XSS攻击
-xss: 
-  # 过滤开关
-  enabled: true
-  # 排除链接（多个用逗号分隔）
-  excludes: /system/notice/*
-  # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*,/base/*,/api/*
-
-# Swagger配置
-swagger:
-  # 是否开启swagger
-  enabled: true
-
-pay:
-#微信支付
-  wxpay:
-    app:
-      appID: wx10bd35e2ea404835
-      mchID: 1612475613
-      key: 123456789123456789123456789abcdd
-      #微信商户平台下载的安全证书存放路径
-      certPath: /app/configs/apiclient_cert.p12
-      #微信支付成功的回调地址
-#      paynotifyUrl: http://weiyun-liusz.com/api/wx/paymentBack
-      paynotifyUrl: https://mini-dev.hobbystock.cn/api/wx/paymentBack
-
-wx:
-  applet:
-    lives:
-      # 直播认证二维码
-      authUrl: https://res.wx.qq.com/op_res/9rSix1dhHfK4rR049JL0PHJ7TpOvkuZ3mE0z7Ou_Etvjf-w1J_jVX0rZqeStLfwh

tyz-admin/configs/application-druid.yml

@@ -1,57 +0,0 @@
-# 数据源配置
-spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: org.postgresql.Driver
-        druid:
-            # 主库数据源
-            master:
-            #test
-#                url: jdbc:postgresql://localhost:5432/emm
-#                url: jdbc:postgresql://192.168.66.165:5432/emm
-#                username: postgres
-#                password: 123456
-                #prod
-                url: jdbc:postgresql://192.168.33.200:5432/tzy_system
-                username: root
-                password: root
-            # 初始连接数
-            initialSize: 5
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量
-            maxActive: 20
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
-            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
-            validationQuery: SELECT 1 
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            webStatFilter: 
-                enabled: true
-            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: 
-                login-password: 
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
-                        multi-statement-allow: true
-                        

tyz-admin/configs/application.yml

@@ -1,188 +0,0 @@
-# 项目相关配置
-tzy:
-  # 名称
-  name: TzyTms
-  # 版本
-  version: 4.5.0
-  # 版权年份
-  copyrightYear: 2019
-  # 实例演示开关
-  demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/tzy/uploadPath，Linux配置 /home/tzy/uploadPath）
-  profile: /home/tzy/uploadPath
-#  profile: F:/tomcat/card/uploadPath
-  # 获取ip地址开关
-  addressEnabled: false
-  #
-  app-version: dev
-
-# 开发环境配置
-server:
-  # 服务器的HTTP端口，默认为80
-  port: 80
-  servlet:
-    # 应用的访问路径
-    context-path: /
-  tomcat:
-    # tomcat的URI编码
-    uri-encoding: UTF-8
-    # tomcat最大线程数，默认为200
-    max-threads: 800
-    # Tomcat启动初始化的线程数，默认值25
-    min-spare-threads: 30
- 
-# 日志配置
-logging:
-  level:
-    com.tzy: debug
-    org.springframework: warn
-  fluentd:
-    enabled: ${FLUENTD_ENABLED:false}
-    host: ${FLUENTD_HOST:127.0.0.1}
-    port: ${FLUENTD_PORT:24225}
-
-# 用户配置
-user:
-  password:
-    # 密码错误{maxRetryCount}次锁定10分钟
-    maxRetryCount: 5
-
-# Spring配置
-spring:
-#静态资源访问
-  resources:
-    static-locations: classpath:/static/,file:/home/tzy/uploadPath,file:F://tomcat//card//uploadPath
-  # 模板引擎
-  thymeleaf:
-    mode: HTML
-    encoding: utf-8
-    # 禁用缓存
-    cache: false
-  # 资源信息
-  messages:
-    # 国际化资源文件路径
-    basename: static/i18n/messages
-  jackson:
-    time-zone: GMT+8
-    date-format: yyyy-MM-dd HH:mm:ss
-  profiles: 
-    active: druid
-  # 文件上传
-  servlet:
-     multipart:
-       # 单个文件大小
-       max-file-size:  10MB
-       # 设置总上传的文件大小
-       max-request-size:  20MB
-  # 服务模块
-  devtools:
-    restart:
-      # 热部署开关
-      enabled: true
-  redis:
-      database: 1
-      host: redis
-      port: 6379
-      password: #Tencheer456!    # 密码（默认为空）
-
-
-      timeout: 6000  # 连接超时时长（毫秒）
-      pool:
-        max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
-        max-wait: -1ms    # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-idle: 10      # 连接池中的最大空闲连接
-        min-idle: 5       # 连接池中的最小空闲连接    
-# MyBatis
-mybatis:
-    # 搜索指定包别名
-    typeAliasesPackage: com.tzy.**.domain
-    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml
-    # 加载全局的配置文件
-    configLocation: classpath:mybatis/mybatis-config.xml
-
-# PageHelper分页插件
-pagehelper: 
-  helperDialect: postgresql
-  reasonable: true
-  supportMethodsArguments: true
-  params: count=countSql 
-
-# Shiro
-shiro:
-  user:
-    # 登录地址
-    loginUrl: /login
-    # 权限认证失败地址
-    unauthorizedUrl: /unauth
-    # 首页地址
-    indexUrl: /index
-    # 验证码开关
-    captchaEnabled: false
-    # 验证码类型 math 数组计算 char 字符
-    captchaType: math
-  cookie:
-    # 设置Cookie的域名 默认空，即当前访问的域名
-    domain: 
-    # 设置cookie的有效访问路径
-    path: /
-    # 设置HttpOnly属性
-    httpOnly: true
-    # 设置Cookie的过期时间，天为单位
-    maxAge: 30
-    # 设置密钥，务必保持唯一性（生成方式，直接拷贝到main运行即可）KeyGenerator keygen = KeyGenerator.getInstance("AES"); SecretKey deskey = keygen.generateKey(); System.out.println(Base64.encodeToString(deskey.getEncoded()));
-    cipherKey: zSyK5Kp6PZAAjlT+eeNMlg==
-  session:
-    # Session超时时间，-1代表永不过期（默认30分钟）
-    expireTime: 480
-    # 同步session到数据库的周期（默认1分钟）
-    dbSyncPeriod: 1
-    # 相隔多久检查一次session的有效性，默认就是10分钟
-    validationInterval: 10
-    # 同一个用户最大会话数，比如2的意思是同一个账号允许最多同时两个人登录（默认-1不限制）
-    maxSession: -1
-    # 踢出之前登录的/之后登录的用户，默认踢出之前登录的用户
-    kickoutAfter: false
-
-# 防止XSS攻击
-xss: 
-  # 过滤开关
-  enabled: true
-  # 排除链接（多个用逗号分隔）
-  excludes: /system/notice/*
-  # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*,/base/*,/api/*
-
-# Swagger配置
-swagger:
-  # 是否开启swagger
-  enabled: true
-
-pay:
-#微信支付
-  wxpay:
-    app:
-      appID: wx10bd35e2ea404835
-      mchID: 1612475613
-      key: 123456789123456789123456789abcdd
-      #微信商户平台下载的安全证书存放路径
-      certPath: \home\tzy\wxpay\cert\apiclient_cert.p12
-      #微信支付成功的回调地址
-#      paynotifyUrl: http://weiyun-liusz.com/api/wx/paymentBack
-      paynotifyUrl: https://mini-dev.hobbystock.cn/api/wx/paymentBack
-
-wx:
-  applet:
-    lives:
-      # 直播认证二维码
-      authUrl: https://res.wx.qq.com/op_res/9rSix1dhHfK4rR049JL0PHJ7TpOvkuZ3mE0z7Ou_Etvjf-w1J_jVX0rZqeStLfwh
-#手机验证码
-phone:
-    verification_code_uri: https://notify.hobbystock.cn/api/verification/code/
-#物流
-express:
-  sf:
-    client_code: LSSWCkEipb #顾客编码
-    check_word: 98vtuFMv6FQabirYZ3LD0OhI1fspjc4Z #校验码
-    box_url: https://sfapi-sbox.sf-express.com/std/service #沙箱环境的地址
-    url: https://sfapi.sf-express.com/std/service #生产环境的地址

tyz-admin/dev/configmap-env

@@ -1,21 +0,0 @@
-CONSOLE_ENABLED=true
-
-FLUENTD_ENABLED=true
-FLUENTD_HOST=192.168.33.1
-FLUENTD_PORT=24225
-
-REDIS_HOST=192.168.33.200
-REDIS_PORT=6379
-REDIS_PASSWORD=Pass2010
-
-DB_URL=jdbc:postgresql://192.168.33.200:5433/tzy_system
-DB_USERNAME=postgres
-DB_PASSWORD=123456
-
-TZ=Asia/Shanghai
-SENTINEL_MASTER=poyee-master
-SENTINEL_NODES=192.168.33.200:26379
-
-RABBITMQ_HOST=192.168.33.1
-RABBITMQ_USERNAME=poyee-admin
-RABBITMQ_PASSWORD=Pass2010

tyz-admin/dev/configmap/application-druid.yml

@@ -1,51 +0,0 @@
-# 数据源配置
-spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: org.postgresql.Driver
-        druid:
-            # 主库数据源
-            master:
-                url: ${DB_URL:jdbc:postgresql://172.29.19.236:5432/tzy_system}
-                username: ${DB_USERNAME:root}
-                password: ${DB_PASSWORD:root}
-            # 初始连接数
-            initialSize: 5
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量
-            maxActive: 20
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
-            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
-            validationQuery: SELECT 1 
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            webStatFilter: 
-                enabled: true
-            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: 
-                login-password: 
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
-                        multi-statement-allow: true
-                        

tyz-admin/dev/configmap/application.yml

@@ -1,289 +0,0 @@
-# 项目相关配置
-tzy:
-  # 名称
-  name: TzyTms
-  # 版本
-  version: 4.5.0
-  # 版权年份
-  copyrightYear: 2019
-  # 实例演示开关
-  demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/tzy/uploadPath，Linux配置 /home/tzy/uploadPath）
-  profile: /tmp
-#  profile: F:/tomcat/card/uploadPath
-  # 获取ip地址开关
-  addressEnabled: false
-  #版本
-  app-version: dev
-  host: m2-dev.hobbystocks.cn
-  finance-host: m2-dev.hobbystocks.cn
-
-#Forest
-forest:
-  #bean-id: config0 # 在spring上下文中bean的id（默认为 forestConfiguration）
-  #backend: okhttp3 # 后端HTTP框架（默认为 okhttp3）
-  #max-connections: 1000 # 连接池最大连接数（默认为 500）
-  #max-route-connections: 500 # 每个路由的最大连接数（默认为 500）
-  timeout: 30000 # 请求超时时间，单位为毫秒（默认为 3000）
-  connect-timeout: 30000 # 连接超时时间，单位为毫秒（默认为 timeout）
-  read-timeout: 30000 # 数据读取超时时间，单位为毫秒（默认为 timeout）
-  #max-retry-count: 0 # 请求失败后重试次数（默认为 0 次不重试）
-  #ssl-protocol: SSLv3 # 单向验证的HTTPS的默认SSL协议（默认为 SSLv3）
-  #logEnabled: true # 打开或关闭日志（默认为 true）
-  #log-request: true # 打开/关闭Forest请求日志（默认为 true）
-  #log-response-status: true # 打开/关闭Forest响应状态日志（默认为 true）
-  #log-response-content: true # 打开/关闭Forest响应内容日志（默认为 false）
-
-# 开发环境配置
-server:
-  # 服务器的HTTP端口，默认为80
-  port: 80
-  servlet:
-    # 应用的访问路径
-    context-path: /
-  tomcat:
-    # tomcat的URI编码
-    uri-encoding: UTF-8
-    # tomcat最大线程数，默认为200
-    max-threads: 800
-    # Tomcat启动初始化的线程数，默认值25
-    min-spare-threads: 30
- 
-# 日志配置
-logging:
-  level:
-    com.tzy: debug
-    org.springframework: warn
-  console.enabled: ${CONSOLE_ENABLED:false}
-  fluentd:
-    enabled: ${FLUENTD_ENABLED:false}
-    host: ${FLUENTD_HOST:127.0.0.1}
-    port: ${FLUENTD_PORT:24225}
-
-# 用户配置
-user:
-  password:
-    # 密码错误{maxRetryCount}次锁定10分钟
-    maxRetryCount: 5
-
-# Spring配置
-spring:
-#静态资源访问
-  resources:
-    static-locations: classpath:/static/,file:/tmp,file:F://tomcat//card//uploadPath
-  # 模板引擎
-  thymeleaf:
-    mode: HTML
-    encoding: utf-8
-    # 禁用缓存
-    cache: false
-  # 资源信息
-  messages:
-    # 国际化资源文件路径
-    basename: static/i18n/messages
-  jackson:
-    time-zone: GMT+8
-    date-format: yyyy-MM-dd HH:mm:ss
-  profiles: 
-    active: druid
-  # 文件上传
-  servlet:
-     multipart:
-       # 单个文件大小
-       max-file-size:  50MB
-       # 设置总上传的文件大小
-       max-request-size:  50MB
-  # 服务模块
-  devtools:
-    restart:
-      # 热部署开关
-      enabled: true
-  redis:
-      database: 1
-      #host: ${REDIS_HOST:172.29.19.234}
-      #port: ${REDIS_PORT:6379}
-      password: ${REDIS_PASSWORD:}
-      sentinel:
-        master: ${SENTINEL_MASTER:local-master}
-        nodes: ${SENTINEL_NODES:127.0.0.1:26379}
-      timeout: 6000  # 连接超时时长（毫秒）
-      pool:
-        max-active: 100  # 连接池最大连接数（使用负值表示没有限制）
-        max-wait: -1ms    # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-idle: 10      # 连接池中的最大空闲连接
-        min-idle: 5       # 连接池中的最小空闲连接
-  rabbitmq:
-    host: ${RABBITMQ_HOST:192.168.33.1}
-    port: 5672
-    username: ${RABBITMQ_USERNAME:poyee-admin}
-    password: ${RABBITMQ_PASSWORD:Pass2010}
-    #确认消息已发送到交换机(Exchange)
-    publisher-confirms: true
-    #确认消息已发送到队列(Queue)
-    publisher-returns: true
-    template:
-      retry:
-        enabled: true
-      mandatory: true
-    listener:
-      simple:
-        acknowledge-mode: manual
-        #并发消费者初始化值
-        #concurrency: 10
-        #并发消费者的最大值
-        #max-concurrency: 20
-        #每个消费者每次监听时可拉取处理的消息数量
-        prefetch: 5
-      direct:
-        retry:
-          enabled: true
-          max-attempts: 1    
-# MyBatis
-mybatis:
-    # 搜索指定包别名
-    typeAliasesPackage: com.tzy.**.domain
-    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml
-    # 加载全局的配置文件
-    configLocation: classpath:mybatis/mybatis-config.xml
-
-# PageHelper分页插件
-pagehelper: 
-  helperDialect: postgresql
-  reasonable: true
-  supportMethodsArguments: true
-  params: count=countSql 
-
-# Shiro
-shiro:
-  user:
-    # 登录地址
-    loginUrl: /login
-    # 权限认证失败地址
-    unauthorizedUrl: /unauth
-    # 首页地址
-    indexUrl: /index
-    # 验证码开关
-    captchaEnabled: false
-    # 验证码类型 math 数组计算 char 字符
-    captchaType: math
-  cookie:
-    # 设置Cookie的域名 默认空，即当前访问的域名
-    domain: 
-    # 设置cookie的有效访问路径
-    path: /
-    # 设置HttpOnly属性
-    httpOnly: true
-    # 设置Cookie的过期时间，天为单位
-    maxAge: 30
-    # 设置密钥，务必保持唯一性（生成方式，直接拷贝到main运行即可）KeyGenerator keygen = KeyGenerator.getInstance("AES"); SecretKey deskey = keygen.generateKey(); System.out.println(Base64.encodeToString(deskey.getEncoded()));
-    cipherKey: zSyK5Kp6PZAAjlT+eeNMlg==
-  session:
-    # Session超时时间，-1代表永不过期（默认30分钟）
-    expireTime: 480
-    # 同步session到数据库的周期（默认1分钟）
-    dbSyncPeriod: 1
-    # 相隔多久检查一次session的有效性，默认就是10分钟
-    validationInterval: 10
-    # 同一个用户最大会话数，比如2的意思是同一个账号允许最多同时两个人登录（默认-1不限制）
-    maxSession: -1
-    # 踢出之前登录的/之后登录的用户，默认踢出之前登录的用户
-    kickoutAfter: false
-
-# 防止XSS攻击
-xss: 
-  # 过滤开关
-  enabled: true
-  # 排除链接（多个用逗号分隔）
-  excludes: /system/notice/*
-  # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*,/base/*,/api/*
-
-# Swagger配置
-swagger:
-  # 是否开启swagger
-  enabled: true
-
-pay:
-#微信支付
-  wxpay:
-    app:
-      appID: wx8ee47a255776f241 #wx0cd9b8fe0a77ab34
-      appletID: wx8ee47a255776f241 #wx0cd9b8fe0a77ab34
-      thirdAndriID: wx22a7349c29e688d4
-      mchID: 1620428472 #1618054254 #1612475613
-      key: f572fa0651ca50e8da327996dd349f6b #cA0aI2eN0bB0eD2fC6tB4kB3aF4fD188 #123456789123456789123456789abcdd
-      #微信商户平台下载的安全证书存放路径
-      certPath: /app/configs/apiclient_cert.p12
-      #微信支付成功的回调地址
-      paynotifyUrl: https://m-dev.hobbystock.cn/api/wx/paymentBack
-      #微信退款结果回调地址
-      refundNotifyUrl: https://m-dev.hobbystock.cn/api/wx/refundBack
-  alipay:
-    app:
-      appId: 2021002181669560
-      privateKey: 
-      alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgCIKpTwnnPm2D1IsMlTvuCq3WBAZKm8IaUqR/IxqQAzwEVuW0+lf6Ririm4PLNcU5eZXK7w+oHqi23b7rL5htqz1K0/q/oBHEeAliCNX+zMr+6sTBN33i5yX/buvVmBPGJJg791lFdnnnELGqZf+nQrJBlOAW/aCVTga7hcf8CH/ZRDboExzf9zK5N6qcxKexsgXZRZso+d47DcAj3sF1lAcYQvTAOG+aJRcwBFFOrb3QYZI1WLOZdjq3kdhXUuVrR8HhQ68BRIvfJGX7Hwy4Ffmb9hD/ljkT1S6+jzslMp3cMbU4IlJPF0o9xxCz4KWiW0pWhwQTolNVqW3GyHG2wIDAQAB
-      privateKeyPath: /app/configs/privatekey.txt
-      #支付宝支付成功的回调地址
-      payNotifyUrl: https://m-dev.hobbystocks.cn/api/ali/paymentBack
-      refundNotifyUrl: https://m-dev.hobbystocks.cn/api/ali/refundBack
-  hm:
-    app:
-      hmPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCkByRMw/sL8tg38lrGi4JFXFR/jrphyyj3LYHYYnTQj3dl+w4JUysgE7cE7FxEfxMkuM3efv6HeMP0vIsYBrS7EXvVB9vm/HH7QcpvqCfUOLhe4ugaDqfKz9/2BQinieiSRy8gRnm5eadEZn42EtxnZ+s6PBPKeijrxz+JyvCR8QIDAQAB
-      publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJBww/AEqKfofkDGP+EkIKC5r4oHw93O6qFJ5QCnGgNMd5MC3q4Pyk6ImOjSj/OdRqTefRdWZUzcjlEPxMBLARa1wqKcdw4f2Wyxr+eT+VcJSQu5F8zWYjtNO+9BVwpKqJ4CXYPyZqY8fAx0urrd9opRkV0xpK3f/mlkgbgF+XvQIDAQAB
-      privateKeyPath: /app/configs/hmPrivatekey.txt
-      wxMchID: 480528577
-      app_id: 663101000155258
-      format: JSON
-      version: 1.0
-      storeId: 100001
-      #支付宝支付成功的回调地址
-      host:
-      payNotifyUrl: https://m-dev.hobbystocks.cn/api/hm/paymentBack
-      refundNotifyUrl: https://m-dev.hobbystocks.cn/api/hm/refundBack
-      returnUrl: hobbystocks:/pageB/productDetail/paySuccessTips?
-      ghStaticUrl: https://hobby-6g7xp6r63e7767bb-1309590715.tcloudbaseapp.com/jump_mp2.html
-      
-wx:
-  default_avatar: https://static.public.hobbystock.cn/applet/share/share_logo2.png
-  applet:
-    lives:
-      # 直播认证二维码
-      authUrl: https://res.wx.qq.com/op_res/9rSix1dhHfK4rR049JL0PHJ7TpOvkuZ3mE0z7Ou_Etvjf-w1J_jVX0rZqeStLfwh
-#直播配置
-living:
-  tencent:
-    key: c018bdfe07b758cb11dc10ffea7feca6 #密钥
-    secretId: AKIDsZ0A3f29zYrsc5IEsFLBk23oztWsxlIX
-    secretKey: 0jBMGtEI5csrZ2E8l9G6fy0lFRN2QXOy
-  im:
-    SDKAppID: 1400661352
-    # App 管理员帐号
-    identifier: administrator
-    secretKey: 0cfedc6714e281271fa35688f57f5a26070d5ccbd0b821d936f4e513ec4eb27b
-    host: 1309648802.vod2.myqcloud.com
-    
-#手机验证码
-phone:
-    verification_code_uri: http://coresvc2/api/verification/code/
-authenticate:
-    url: http://coresvc2/api/auth/
-#服务前缀路径
-coreService:
-  baseurl: http://coresvc2
-  smsUrl: /api/reminder/live/on
-  appSmsUrl: /api/appmsg/live/on
-cardSearchService:
-  baseurl: http://poyee-card-report
-#物流
-express:
-  sf:
-    client_code: LSSWCkEipb #顾客编码
-    check_word: 98vtuFMv6FQabirYZ3LD0OhI1fspjc4Z #校验码
-    box_url: https://sfapi-sbox.sf-express.com/std/service #沙箱环境的地址
-    url: https://sfapi.sf-express.com/std/service #生产环境的地址
-  jd:
-    appkey: 76f41d301d75499f9a85f9603f535a26
-    appsecret: 44d5f413cebb406b867b4f5b3477b0af
-    redirect_uri: https://m-dev.hobbystocks.cn/api/home/jdAuth

tyz-admin/dev/configmap/hmPrivatekey.txt

@@ -1 +0,0 @@
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAIkHDD8ASop+h+QMY/4SQgoLmvigfD3c7qoUnlAKcaA0x3kwLerg/KToiY6NKP851GpN59F1ZlTNyOUQ/EwEsBFrXCopx3Dh/ZbLGv55P5VwlJC7kXzNZiO00770FXCkqongJdg/Jmpjx8DHS6ut32ilGRXTGkrd/+aWSBuAX5e9AgMBAAECgYAtN3ApEfWHAf3hmN0eJ/Q20GGRDZQx7cerxCYBj5CzJvdz3Bwq15dG650ItzgCEJkxgweuLKlZ7pYOUK6QfzOB65+zdVGMtXrn5qN/rX1dUTI2fia4OQ1qytgCTDxRM0phK7QrQMznDeyqFWqy8+F8teKOWphe3j+x/B2I6YogwQJBAPcviu9cZhfs7LZGpr07jp8PMO43OPFJACfmZeTKprRRLGJi3U08HfzypnYk8TRmtYZ058+P7fFyiTRGY+tGyTkCQQCN6eqG5ppL1V2FaYQ1XMySH9W/as9DGvBckqiI1VfCC5xA1Fi2A96QB9azHCo28F7wJuNB8JNAVQPYb47THRalAkEAxxPlQ64ZE3/fjVYNiC5lSTmE4PZcyAdRNtFakw+bf3I42uxg64lVZZlP86sBEIEABdA1undi3aivVAi1BJI4EQJADG56UfjveUcmmyJEJ5yKex54zfzgTSOV/LYIN3xg5Km5tWAkqUUrgPh+0U/dTtS9rFHrxIH7lD4eSR50p3+71QJBAK49kgOA2Cz0BpC9fQQ1hhEedEMx0mTWrG2Qr0cCLLr7tC/WbrZtzlldS3BCgU8WAmFwkUYC6cI9fb2O9226nCY=

tyz-admin/dev/configmap/privatekey.txt

@@ -1 +0,0 @@
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCAxgc1joj5s/fZNwL48tMJf1QYU0Uth5kuvzkmIUmFJqxA5F4gQRUoq3XZXpkF/eNArrVfXNAOcqFFutjJ1+RUHEiSrkaQPNAq1sCP5H9ZKhHaMP8x1XyOrgYViSQ/r8hnuLRCkbVc3+kkQNf8L0j724Sxiby7PUFl2WxAe6xcNL04Viv6HOzsYSS0sBAJWRNZBPPMLREcmxv/fZe2zOA1xM+4J6IhJbkOSzupJy96keJWisYmTqjxas7q0RkqyabwyTcfkRzDv6kf4qAK5S1nTpD8iva0V7dLwBMjNcy0lmkCDDDhF00jQYpSYi7gc1Gk1/xfdWVrvsvXSO7fCsnFAgMBAAECggEAc4k5DqRD4UXHKexhjlrPXcYP/YM4nhD7LyYCcGONQxnfkplSmj3KbiLoKY7mXKneKzqVIGp1gYD3kUiDGRXKlmyJ8JDMXr0xSD5FptSsLaPBQLKVRHD2wE0CyG+zRjDA7c6abN+uiRWcaBqFro3+PXpHI8Mgwh3Df04EAhb0HgUk1XZbvRNN2VfEqKNgv3QrVzu0Sh1JWszrrMEo4izxcF9MkOVFedJmKTsC+C8BnWjwlmFGlEgkqbVNAfkTLR6jn3A6hyVQ//nDp7w3/l/G8o7aUrnG5UDyLfVR7cB/asp5oIHKaZfjvR/9r6e0UXtK0l0wEi4b4tG6O2feztrGQQKBgQDlIk4W14wEdbF564/oNLAG7YFqyDIfnNQEHiMyZczYIXd5eugacAieCNUjGQGWDXxZrBRreXPmwjMmLj//ByBZsN3ykHqt4DT2N+g3Hrl11K2TjJEEIQw1zYB294kfKCUYqtJZ3g4SyGOyqCxOpWd42hS9Lv9KkpanXXPbqScScwKBgQCP30zDD42WI+fkLwDEjZX8ABFQAimH3Ay5lp8x9mq8F5KpaYs4+us6qnr9GmnA8FjVgO/ar5OqoaAMzl+NML/eSjY/guXYQtv54g7AcFnytC3+wQrnFfFVZzpi08DSa0+mHSZJn1e/CP//lN7+JPc+Xcef8xlTjB+WUAb6CLVM5wKBgQCWm67iWrmg8M9ACTLk+US+uPw4+O/hUY8WSczuwnUblxvV0JChWASCA+I8mKIvRBv5QR+G6STih8FhFkNgWQnNinDIkGjiwx1svaC4IkzbA3k4I8vp/+LrtnD7QYdy4EtJ5HYxNcDgXbESbHH7G8Ngb0/0beDF3oaB6e5OcufIuwKBgDx5xK6Jrx5ZYXRNPalhSpZvANf80LBHEyI/6hL6XctKrV+A+gCtmItEdgZGQAXWAcFdPXVTMGMdJUW8yfVzdHNgBoWT5EGPeSAEoebKU0Tt8BeR1Z9lXdhkV+qK0Bai/Qv6XMm9rQikI9evIDz8FOGmUe8uJIs172EjqosXdf4pAoGBAMC0CJ93guzXLXdd5R2EFk0SCuK9LTBPXOzxpHVu2ZzRVw8UIApojnz0xhccxBZh02+mb/pQWMW8sXuvdjJUZLAeLPyzJ9r3lc5EUbBbc2mbJ7k/5zzI+e5uL5yChhTsaFZtSfurh+l3k559Xc+LAFjlmNOvT7KygsuR7QccXs5o

tyz-admin/dev/jenkinsfile

@@ -1,163 +0,0 @@
-node {
-    service_name = "tzy"
-    registry = "registry.azure.ipangyou.com/poyi/${service_name}"
-    k3s_opts = "--kubeconfig ~/k3s-dev.yaml"
-    cpu_limits = "800m"
-    cpu_requests = "500m"
-    
-    stage('source code check out'){
-
-      echo "1. Check out project source ..."
-      dir("projdir"){
-          //git branch: 'master', credentialsId: 'lingxz_git.ipangyou.com', url: 'https://git.ipangyou.com/poyi/tzy-admin.git'
-          checkout([$class: 'GitSCM',
-                branches: [[name: 'master']],
-                doGenerateSubmoduleConfigurations: false,
-                extensions: [[$class: 'CleanBeforeCheckout'], [$class: 'CloneOption', depth: 1, noTags: false, reference: '', shallow: true, timeout: 240]],
-                submoduleCfg: [],
-                userRemoteConfigs: [[credentialsId: 'lingxz_git.ipangyou.com', url: 'https://git.ipangyou.com/poyi/tzy-admin.git']]
-            ])
-      }
-      dir("confdir") {
-          git branch: 'master', credentialsId: 'lingxz_git.ipangyou.com', url: 'http://git.ipangyou.com/poyi/deployments.git'
-      }
-    }
-
-    stage("maven build") {
-
-      echo "2. Building java package ..."
-      dir("projdir"){
-        sh '$MAVEN_HOME/bin/mvn clean package'
-      }
-    }
-        
-    stage("docker image build") {
-
-      echo "3. Building docker image: $registry:dev-$BUILD_NUMBER ..."
-      dir("projdir"){
-          sh '''cat > Dockerfile<<EOF
-FROM openjdk:8-alpine as final
-
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories &&\
-  apk add --update ttf-dejavu &&\
-  rm -rf /var/cache/apk/*
-
-ADD tzy-admin/target/tzy-admin.jar /app/tzy-admin/target/tzy-admin.jar
-#Minimum heap size set to 128mb as Xms128m, and maximum is set to 512 as Xmx512m - to be configured depending on individual needs of the app
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xmx4096m","-Dserver.port=80","-jar","/app/tzy-admin/target/tzy-admin.jar", "--spring.config.location=file:/app/configs/application.yml,file:/app/configs/application-druid.yml"]
-EOF
-'''
-          def image = docker.build("$registry:dev-$BUILD_NUMBER")
-          image.push()
-          sh "docker rmi $registry:dev-$BUILD_NUMBER"
-        }
-    }
-    
-    stage("deploy") {
-    
-      dir("confdir/tyz-admin/dev") {
-          configmap_file = 'configmap.yaml'
-          configmap_env = 'configmap-env.yaml'
-          sh "kubectl ${k3s_opts} create configmap tzy-config --dry-run=client --from-file=./configmap/ -o yaml > ${configmap_file}"
-          sh "kubectl ${k3s_opts} apply -f ${configmap_file}"
-          sh "kubectl ${k3s_opts} create configmap tzy-environment --dry-run=client --from-env-file=./configmap-env -o yaml > ${configmap_env}"
-          sh "kubectl ${k3s_opts} apply -f ${configmap_env}"
-      }
-        
-      sh """cat > deployment.yml<<EOF
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: tzy-admin
-  namespace: default
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: tzy-admin
-      release: dev
-  template:
-    metadata:
-      labels:
-        app: tzy-admin
-        release: dev
-    spec:
-      imagePullSecrets:
-      - name: regcredential
-      containers:
-      - name: tzy-admin
-        image: ${registry}:dev-$BUILD_NUMBER
-        command: ["java"]
-        args: ["-Djava.security.egd=file:/dev/./urandom","-Xmx2048m","-Dserver.port=80","-jar","/app/tzy-admin/target/tzy-admin.jar", "--spring.config.location=file:/app/configs/application.yml,file:/app/configs/application-druid.yml"]
-        ports:
-        - name: http
-          containerPort: 80
-        envFrom:
-        - configMapRef:
-            name: tzy-environment
-        volumeMounts:
-        - name: config-volume
-          mountPath: /app/configs
-      volumes:
-      - name: config-volume
-        configMap:
-          name: tzy-config
-EOF
-"""
-        sh "kubectl ${k3s_opts} apply -f deployment.yml"
-
-        sh """cat > deployment-merchant.yml<<EOF
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: tzy-merchant
-  namespace: default
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: tzy-merchant
-      release: dev
-  template:
-    metadata:
-      labels:
-        app: tzy-merchant
-        release: dev
-    spec:
-      imagePullSecrets:
-      - name: regcredential
-      containers:
-      - name: tzy-merchant
-        image: ${registry}:dev-$BUILD_NUMBER
-        command: ["java"]
-        args: ["-Djava.security.egd=file:/dev/./urandom","-Xmx2048m","-Dserver.port=80","-jar","/app/tzy-admin/target/tzy-admin.jar", "--spring.config.location=file:/app/configs/application.yml,file:/app/configs/application-druid.yml"]
-        resources:
-          limits:
-            cpu: $cpu_limits
-          requests:
-            cpu: $cpu_requests
-        readinessProbe:
-          httpGet:
-            path: /health
-            port: 80
-          initialDelaySeconds: 15
-          periodSeconds: 30
-          failureThreshold: 3
-        ports:
-        - name: http
-          containerPort: 80
-        envFrom:
-        - configMapRef:
-            name: tzy-environment
-        volumeMounts:
-        - name: config-volume
-          mountPath: /app/configs
-      volumes:
-      - name: config-volume
-        configMap:
-          name: tzy-config
-EOF
-"""
-        sh "kubectl ${k3s_opts} apply -f deployment-merchant.yml"
-    }
-}

tyz-admin/dev/service.yaml

@@ -1,61 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: tzy-admin
-
-spec:
-  ports:
-    - protocol: TCP
-      name: web
-      port: 80
-  selector: #selector of pods
-    app: tzy-admin
-    release: dev
-
----
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: tzy-admin-http
-  namespace: default
-spec:
-  entryPoints:
-  - web
-  routes:
-  - match: Host(`mini-dev.hobbystock.cn`)
-    kind: Rule
-    services:
-    - name: tzy-admin
-      port: 80
-    #middlewares:
-    #- name: redirect-to-https
-
----
-#apiVersion: traefik.containo.us/v1alpha1
-#kind: IngressRoute
-#metadata:
-#  name: tzy-admin-https
-#  namespace: default
-#spec:
-#  entryPoints:
-#  - websecure
-#  routes:
-#  - match: Host(`mini-dev.hobbystock.cn`)
-#    kind: Rule
-#    services:
-#    - name: tzy-admin
-#      port: 80
-#  tls:
-#    certResolver: myresolver
-
----
-# Redirect to https
-apiVersion: traefik.containo.us/v1alpha1
-kind: Middleware
-metadata:
-  name: redirect-to-https
-spec:
-  redirectScheme:
-    scheme: https
-    permanent: true

tyz-admin/jenkinsfile

@@ -1,79 +0,0 @@
-node {
-    service_name = "tzy-admin"
-    registry = "registry.azure.ipangyou.com/poyi/${service_name}"
-    
-    try{
-        stage("source code check out"){
-    
-            echo "1. Check out project source ..."
-            dir("projdir"){
-                git branch: 'master', credentialsId: 'lingxz_git.ipangyou.com', url: 'https://git.ipangyou.com/poyi/tzy-admin.git'
-            }
-            dir("confdir") {
-                git branch: 'master', credentialsId: 'lingxz_git.ipangyou.com', url: 'http://git.ipangyou.com/poyi/deployments.git'
-            }
-        }
-        
-        stage("maven build") {
-        
-            echo "2. Building java package ..."
-            dir("projdir"){
-                sh '$MAVEN_HOME/bin/mvn clean package'
-            }
-        }
-        
-        stage("docker image build") {
-
-            echo "3. Building docker image: $registry:$BUILD_NUMBER ..."
-            dir("projdir"){
-                sh '''cat > Dockerfile<<EOF
-FROM openjdk:8-alpine as final
-ADD tzy-admin/target/tzy-admin.jar /app/tzy-admin/target/tzy-admin.jar
-#Minimum heap size set to 128mb as Xms128m, and maximum is set to 512 as Xmx512m - to be configured depending on individual needs of the app
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xmx4096m","-Dserver.port=80","-jar","/app/tzy-admin/target/tzy-admin.jar", "--spring.config.location=file:/app/application.yml,file:/app/application-druid.yml"]
-EOF
-'''
-        		def image = docker.build("$registry:$BUILD_NUMBER")
-            	image.push()
-                sh "docker rmi $registry:$BUILD_NUMBER"
-            }
-        }
-        
-        stage("deploy") {
-            
-            HOST = 'docker.hobbystock.cn'
-            echo "4. Deploying on server: ${HOST} ..."
-            dir('confdir') {
-                // put configuration files
-                remote = [:]
-                remote.name = "name"
-                remote.host = "127.0.0.1"
-                remote.port = 22100
-                remote.allowAnyHosts = true
-                remote.failOnError = true
-                withCredentials([sshUserPrivateKey(credentialsId: 'root_key_at_hobbystock.cn', usernameVariable:'username', keyFileVariable: 'identity', passphraseVariable: '')]){
-                    remote.user = username
-                    remote.identityFile = identity
-                    sshPut remote: remote, from: 'tyz-admin/configs', into: '.'
-                }
-            }
-            
-            // update docker image
-            DOCKER_OPTS = "-H tcp://${HOST}:2375 --tlsverify"
-            network = "app_network"
-            sh "if [ \$(docker ${DOCKER_OPTS} ps -aq --filter name=${service_name}) ]; then docker ${DOCKER_OPTS} rm -f ${service_name};fi"
-            EXEC_RUN = """docker ${DOCKER_OPTS} run -d --network ${network} --restart=always -p 80:80 --name ${service_name} \
--e TZ=Asia/Shanghai -e FLUENTD_ENABLED=true -e FLUENTD_HOST=192.168.33.1 -e FLUENTD_PORT=24225 \
--v /root/configs/application.yml:/app/application.yml -v /root/configs/application-druid.yml:/app/application-druid.yml \
--v /root/nfs:/home/tzy \
-${registry}:${BUILD_NUMBER}"""
-            sh "$EXEC_RUN"
-    }
-    } catch (e) {
-        mail to: '81554636@qq.com,xiaozhou.ling@hobbystock.cn,1169705999@qq.com', body: "${e}", subject: "[DEV]error occurs in building tzy-admin:$BUILD_NUMBER"
-        throw e
-    } finally {
-    }
-    
-    mail to: '81554636@qq.com,xiaozhou.ling@hobbystock.cn,1169705999@qq.com', body: "success", subject: "[DEV]succeed building tzy-admin:$BUILD_NUMBER"
-}

tyz-admin/jenkinsfile_dev

@@ -1,99 +0,0 @@
-node {
-    service_name = "tzy"
-    registry = "registry.azure.ipangyou.com/poyi/${service_name}"
-    
-    stage('source code check out'){
-
-      echo "1. Check out project source ..."
-      dir("projdir"){
-          git branch: 'master', credentialsId: 'lingxz_git.ipangyou.com', url: 'https://git.ipangyou.com/poyi/tzy-admin.git'
-      }
-      dir("confdir") {
-          git branch: 'master', credentialsId: 'lingxz_git.ipangyou.com', url: 'http://git.ipangyou.com/poyi/deployments.git'
-      }
-    }
-
-    stage("maven build") {
-
-      echo "2. Building java package ..."
-      dir("projdir"){
-        sh '$MAVEN_HOME/bin/mvn clean package'
-      }
-    }
-        
-    stage("docker image build") {
-
-      echo "3. Building docker image: $registry:$BUILD_NUMBER ..."
-      dir("projdir"){
-          sh '''cat > Dockerfile<<EOF
-FROM openjdk:8-alpine as final
-ADD tzy-admin/target/tzy-admin.jar /app/tzy-admin/target/tzy-admin.jar
-#Minimum heap size set to 128mb as Xms128m, and maximum is set to 512 as Xmx512m - to be configured depending on individual needs of the app
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xmx4096m","-Dserver.port=80","-jar","/app/tzy-admin/target/tzy-admin.jar", "--spring.config.location=file:/app/configs/application.yml,file:/app/configs/application-druid.yml"]
-EOF
-'''
-          def image = docker.build("$registry:$BUILD_NUMBER")
-          image.push()
-          sh "docker rmi $registry:$BUILD_NUMBER"
-        }
-    }
-    
-    stage("deploy") {
-    
-      dir("confdir/tyz-admin/dev") {
-          configmap_file = 'configmap.yaml'
-          configmap_env = 'configmap-env.yaml'
-          sh "kubectl create configmap tzy-config --dry-run=client --from-file=./configmap/ -o yaml > ${configmap_file}"
-          sh "kubectl apply -f ${configmap_file}"
-          sh "kubectl create configmap tzy-environment --dry-run=client --from-env-file=./configmap-env -o yaml > ${configmap_env}"
-          sh "kubectl apply -f ${configmap_env}"
-      }
-        
-      sh """cat > deployment.yml<<EOF
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: tzy-admin
-  namespace: default
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: tzy-admin
-      release: dev
-  template:
-    metadata:
-      labels:
-        app: tzy-admin
-        release: dev
-    spec:
-      imagePullSecrets:
-      - name: regcredential
-      containers:
-      - name: tzy-admin
-        image: ${registry}:$BUILD_NUMBER
-        command: ["java"]
-        args: ["-Djava.security.egd=file:/dev/./urandom","-Xmx2048m","-Dserver.port=80","-jar","/app/tzy-admin/target/tzy-admin.jar", "--spring.config.location=file:/app/configs/application.yml,file:/app/configs/application-druid.yml"]
-        ports:
-        - name: http
-          containerPort: 80
-        envFrom:
-        - configMapRef:
-            name: tzy-environment
-        volumeMounts:
-        - name: config-volume
-          mountPath: /app/configs
-        - name: nfs-volume
-          mountPath: /app/data
-      volumes:
-      - name: config-volume
-        configMap:
-          name: tzy-config
-      - name: nfs-volume
-        persistentVolumeClaim:
-          claimName: tzy-data
-EOF
-"""
-        sh 'kubectl apply -f deployment.yml'
-    }
-}

tyz-admin/jenkinsfile_k3s

@@ -1,98 +0,0 @@
-node {
-    service_name = "tzy"
-    registry = "registry.azure.ipangyou.com/poyi/${service_name}"
-    
-    stage('source code check out'){
-        echo "1. Check out project source ..."
-        dir("projdir"){
-            git branch: 'master', credentialsId: 'lingxz_git.ipangyou.com', url: 'https://git.ipangyou.com/poyi/tzy-admin.git'
-        }
-        dir("confdir") {
-            git branch: 'master', credentialsId: 'lingxz_git.ipangyou.com', url: 'http://git.ipangyou.com/poyi/deployments.git'
-        }
-    }
-
-    stage("maven build") {
-        
-            echo "2. Building java package ..."
-            dir("projdir"){
-                sh '$MAVEN_HOME/bin/mvn clean package'
-            }
-        }
-        
-        stage("docker image build") {
-
-            echo "3. Building docker image: $registry:$BUILD_NUMBER ..."
-            dir("projdir"){
-                sh '''cat > Dockerfile<<EOF
-FROM openjdk:8-alpine as final
-ADD tzy-admin/target/tzy-admin.jar /app/tzy-admin/target/tzy-admin.jar
-#Minimum heap size set to 128mb as Xms128m, and maximum is set to 512 as Xmx512m - to be configured depending on individual needs of the app
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xmx4096m","-Dserver.port=80","-jar","/app/tzy-admin/target/tzy-admin.jar", "--spring.config.location=file:/app/configs/application.yml,file:/app/configs/application-druid.yml"]
-EOF
-'''
-        		  def image = docker.build("$registry:$BUILD_NUMBER")
-            	image.push()
-              sh "docker rmi $registry:$BUILD_NUMBER"
-            }
-        }
-    
-    stage("deploy") {
-    
-        dir("confdir") {
-            configmap_file = 'tzy-admin-configmap.yaml'
-            configmap_env = 'tzy-admin-configmap-env.yaml'
-            sh "kubectl create configmap tzy-config --dry-run=client --from-file=./tyz-admin/configmap/ -o yaml > ${configmap_file}"
-            sh "kubectl apply -f ${configmap_file}"
-            sh "kubectl create configmap tzy-environment --dry-run=client --from-env-file=./tyz-admin/configmap-env -o yaml > ${configmap_env}"
-            sh "kubectl apply -f ${configmap_env}"
-        }
-        
-        sh """cat > deployment.yml<<EOF
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: tzy-admin
-  namespace: default
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: tzy-admin
-      release: dev
-  template:
-    metadata:
-      labels:
-        app: tzy-admin
-        release: dev
-    spec:
-      imagePullSecrets:
-      - name: regcredential
-      containers:
-      - name: tzy-admin
-        image: ${registry}:$BUILD_NUMBER
-        command: ["java"]
-        args: ["-Djava.security.egd=file:/dev/./urandom","-Xmx4096m","-Dserver.port=80","-jar","/app/tzy-admin/target/tzy-admin.jar", "--spring.config.location=file:/app/configs/application.yml,file:/app/configs/application-druid.yml"]
-        ports:
-        - name: http
-          containerPort: 80
-        envFrom:
-        - configMapRef:
-            name: tzy-environment
-        volumeMounts:
-        - name: config-volume
-          mountPath: /app/configs
-        - name: nfs-volume
-          mountPath: /app/data
-      volumes:
-      - name: config-volume
-        configMap:
-          name: tzy-config
-      - name: nfs-volume
-        persistentVolumeClaim:
-          claimName: tzy-data
-EOF
-"""
-            sh 'kubectl apply -f deployment.yml'
-    }
-}

tyz-admin/jenkinsfile_mock

@@ -1,115 +0,0 @@
-node {
-    service_name = "tzy"
-    registry = "registry.azure.ipangyou.com/poyi/${service_name}"
-    k3s_opts = "--kubeconfig ~/k3s-prod.yaml"
-    
-    try{
-      stage('source code check out'){
-
-        echo "1. Check out project source ..."
-        dir("projdir"){
-            //git branch: 'master', credentialsId: 'lingxz_git.ipangyou.com', url: 'https://git.ipangyou.com/poyi/tzy-admin.git'
-            checkout([$class: 'GitSCM',
-                branches: [[name: 'master']],
-                doGenerateSubmoduleConfigurations: false,
-                extensions: [[$class: 'CleanBeforeCheckout'], [$class: 'CloneOption', depth: 1, noTags: false, reference: '', shallow: true, timeout: 240]],
-                submoduleCfg: [],
-                userRemoteConfigs: [[credentialsId: 'lingxz_git.ipangyou.com', url: 'https://git.ipangyou.com/poyi/tzy-admin.git']]
-            ])
-        }
-        dir("confdir") {
-            git branch: 'master', credentialsId: 'lingxz_git.ipangyou.com', url: 'http://git.ipangyou.com/poyi/deployments.git'
-        }
-      }
-
-      stage("maven build") {
-
-        echo "2. Building java package ..."
-        dir("projdir"){
-          sh '$MAVEN_HOME/bin/mvn clean package'
-        }
-      }
-          
-      stage("docker image build") {
-
-        echo "3. Building docker image: $registry:$BUILD_NUMBER ..."
-        dir("projdir"){
-            sh '''cat > Dockerfile<<EOF
-FROM openjdk:8-alpine as final
-ADD tzy-admin/target/tzy-admin.jar /app/tzy-admin/target/tzy-admin.jar
-#Minimum heap size set to 128mb as Xms128m, and maximum is set to 512 as Xmx512m - to be configured depending on individual needs of the app
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xmx4096m","-Dserver.port=80","-jar","/app/tzy-admin/target/tzy-admin.jar", "--spring.config.location=file:/app/configs/application.yml,file:/app/configs/application-druid.yml"]
-EOF
-'''
-            def image = docker.build("$registry:$BUILD_NUMBER")
-            image.push()
-            sh "docker rmi $registry:$BUILD_NUMBER"
-          }
-      }
-      
-      stage("deploy") {
-      
-        dir("confdir/tyz-admin/mock") {
-            configmap_file = 'configmap.yaml'
-            configmap_env = 'configmap-env.yaml'
-            sh "kubectl ${k3s_opts} create configmap tzy-mock-config --dry-run=client --from-file=./configmap/ -o yaml > ${configmap_file}"
-            sh "kubectl ${k3s_opts} apply -f ${configmap_file}"
-            sh "kubectl ${k3s_opts} create configmap tzy-mock-environment --dry-run=client --from-env-file=./configmap-env -o yaml > ${configmap_env}"
-            sh "kubectl ${k3s_opts} apply -f ${configmap_env}"
-        }
-          
-        sh """cat > deployment.yml<<EOF
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: tzy-admin-mock
-  namespace: default
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: tzy-admin
-      release: mock
-  template:
-    metadata:
-      labels:
-        app: tzy-admin
-        release: mock
-    spec:
-      imagePullSecrets:
-      - name: regcredential
-      containers:
-      - name: tzy-admin
-        image: ${registry}:$BUILD_NUMBER
-        command: ["java"]
-        args: ["-Djava.security.egd=file:/dev/./urandom","-Xmx2048m","-Dserver.port=80","-jar","/app/tzy-admin/target/tzy-admin.jar", "--spring.config.location=file:/app/configs/application.yml,file:/app/configs/application-druid.yml"]
-        ports:
-        - name: http
-          containerPort: 80
-        envFrom:
-        - configMapRef:
-            name: tzy-mock-environment
-        volumeMounts:
-        - name: config-volume
-          mountPath: /app/configs
-        - name: nfs-volume
-          mountPath: /app/data
-      volumes:
-      - name: config-volume
-        configMap:
-          name: tzy-mock-config
-      - name: nfs-volume
-        persistentVolumeClaim:
-          claimName: tzy-data
-EOF
-  """
-          sh "kubectl ${k3s_opts} apply -f deployment.yml"
-      }
-    } catch (e) {
-        mail to: '81554636@qq.com,xiaozhou.ling@hobbystock.cn,1169705999@qq.com', body: "${e}", subject: "[MOCK]error occurs in building tzy-admin:$BUILD_NUMBER"
-        throw e
-    } finally {
-    }
-    
-    mail to: '81554636@qq.com,xiaozhou.ling@hobbystock.cn,1169705999@qq.com', body: "Building success", subject: "[MOCK]succeed building tzy-admin:$BUILD_NUMBER"
-}

tyz-admin/jenkinsfile_prod

@@ -1,142 +0,0 @@
-node {
-    service_name = "tzy"
-    registry = "registry.azure.ipangyou.com/poyi/${service_name}"
-    k3s_opts = "--kubeconfig ~/k3s-prod.yaml"
-    cpu_limits = "850m"
-    cpu_requests = "500m"
-    
-    try{
-      stage('source code check out'){
-
-        echo "1. Check out project source ..."
-        dir("projdir"){
-            // git branch: 'master', credentialsId: 'lingxz_git.ipangyou.com', url: 'https://git.ipangyou.com/poyi/tzy-admin.git'
-            checkout([$class: 'GitSCM',
-                branches: [[name: 'master']],
-                doGenerateSubmoduleConfigurations: false,
-                extensions: [[$class: 'CleanBeforeCheckout'], [$class: 'CloneOption', depth: 1, noTags: false, reference: '', shallow: true, timeout: 240]],
-                submoduleCfg: [],
-                userRemoteConfigs: [[credentialsId: 'lingxz_git.ipangyou.com', url: 'https://git.ipangyou.com/poyi/tzy-admin.git']]
-            ])
-        }
-        dir("confdir") {
-            git branch: 'master', credentialsId: 'lingxz_git.ipangyou.com', url: 'http://git.ipangyou.com/poyi/deployments.git'
-        }
-      }
-
-      stage("maven build") {
-
-        echo "2. Building java package ..."
-        dir("projdir"){
-          sh '$MAVEN_HOME/bin/mvn clean package'
-        }
-      }
-          
-      stage("docker image build") {
-
-        echo "3. Building docker image: $registry:$BUILD_NUMBER ..."
-        dir("projdir"){
-            sh '''cat > Dockerfile<<EOF
-FROM openjdk:8-alpine as final
-
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories &&\
-  apk add --update ttf-dejavu &&\
-  rm -rf /var/cache/apk/*
-  
-ADD tzy-admin/target/tzy-admin.jar /app/tzy-admin/target/tzy-admin.jar
-#Minimum heap size set to 128mb as Xms128m, and maximum is set to 512 as Xmx512m - to be configured depending on individual needs of the app
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xmx4096m","-Dserver.port=80","-jar","/app/tzy-admin/target/tzy-admin.jar", "--spring.config.location=file:/app/configs/application.yml,file:/app/configs/application-druid.yml"]
-EOF
-'''
-            def image = docker.build("$registry:$BUILD_NUMBER")
-            image.push()
-            sh "docker rmi $registry:$BUILD_NUMBER"
-          }
-      }
-      
-      stage("deploy") {
-      
-        dir("confdir/tyz-admin/prod") {
-            configmap_file = 'configmap.yaml'
-            configmap_env = 'configmap-env.yaml'
-            sh "kubectl ${k3s_opts} create configmap tzy-config --dry-run=client --from-file=./configmap/ -o yaml > ${configmap_file}"
-            sh "kubectl ${k3s_opts} apply -f ${configmap_file}"
-            sh "kubectl ${k3s_opts} create configmap tzy-environment --dry-run=client --from-env-file=./configmap-env -o yaml > ${configmap_env}"
-            sh "kubectl ${k3s_opts} apply -f ${configmap_env}"
-        }
-          
-        sh """cat > deployment.yml<<EOF
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: tzy-admin
-  namespace: default
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: tzy-admin
-      release: prod
-  template:
-    metadata:
-      labels:
-        app: tzy-admin
-        release: prod
-    spec:
-      affinity:
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - podAffinityTerm:
-              labelSelector:
-                matchExpressions:
-                - key: app
-                  operator: In
-                  values:
-                  - tzy-admin
-              topologyKey: kubernetes.io/hostname
-            weight: 100
-      imagePullSecrets:
-      - name: regcredential
-      containers:
-      - name: tzy-admin
-        image: ${registry}:$BUILD_NUMBER
-        command: ["java"]
-        args: ["-Djava.security.egd=file:/dev/./urandom","-Xmx1536m","-Dserver.port=80","-jar","/app/tzy-admin/target/tzy-admin.jar", "--spring.config.location=file:/app/configs/application.yml,file:/app/configs/application-druid.yml"]
-        resources:
-          limits:
-            cpu: $cpu_limits
-          requests:
-            cpu: $cpu_requests
-        readinessProbe:
-          httpGet:
-            path: /health
-            port: 80
-          initialDelaySeconds: 15
-          periodSeconds: 30
-          failureThreshold: 5
-          timeoutSeconds: 10
-        ports:
-        - name: http
-          containerPort: 80
-        envFrom:
-        - configMapRef:
-            name: tzy-environment
-        volumeMounts:
-        - name: config-volume
-          mountPath: /app/configs
-      volumes:
-      - name: config-volume
-        configMap:
-          name: tzy-config
-EOF
-  """
-          sh "kubectl ${k3s_opts} apply -f deployment.yml"
-      }
-    } catch (e) {
-        mail to: 'xiaozhou.ling@hobbystocks.cn,1169705999@qq.com', body: "${e}", subject: "[PROD]error occurs in building tzy-admin:$BUILD_NUMBER"
-        throw e
-    } finally {
-    }
-    
-    mail to: 'xiaozhou.ling@hobbystocks.cn,1169705999@qq.com', body: "Building success", subject: "[PROD]succeed building tzy-admin:$BUILD_NUMBER"
-}

tyz-admin/mock/configmap-env

@@ -1,12 +0,0 @@
-FLUENTD_ENABLED=true
-FLUENTD_HOST=172.29.19.236
-FLUENTD_PORT=24225
-
-REDIS_HOST=10.10.33.250
-REDIS_PORT=6379
-
-DB_URL=jdbc:postgresql://10.10.33.250:5432/tzy_system
-DB_USERNAME=postgres
-DB_PASSWORD=123456
-
-TZ=Asia/Shanghai

tyz-admin/mock/configmap/application-druid.yml

@@ -1,51 +0,0 @@
-# 数据源配置
-spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: org.postgresql.Driver
-        druid:
-            # 主库数据源
-            master:
-                url: ${DB_URL:jdbc:postgresql://172.29.19.236:5432/tzy_system}
-                username: ${DB_USERNAME:root}
-                password: ${DB_PASSWORD:root}
-            # 初始连接数
-            initialSize: 5
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量
-            maxActive: 20
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
-            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
-            validationQuery: SELECT 1 
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            webStatFilter: 
-                enabled: true
-            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: 
-                login-password: 
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
-                        multi-statement-allow: true
-                        

tyz-admin/mock/configmap/application.yml

@@ -1,203 +0,0 @@
-# 项目相关配置
-tzy:
-  # 名称
-  name: TzyTms
-  # 版本
-  version: 4.5.0
-  # 版权年份
-  copyrightYear: 2019
-  # 实例演示开关
-  demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/tzy/uploadPath，Linux配置 /home/tzy/uploadPath）
-  profile: /app/data/uploadPath
-#  profile: F:/tomcat/card/uploadPath
-  # 获取ip地址开关
-  addressEnabled: false
-  #版本
-  app-version: prod
-
-# 开发环境配置
-server:
-  # 服务器的HTTP端口，默认为80
-  port: 80
-  servlet:
-    # 应用的访问路径
-    context-path: /
-  tomcat:
-    # tomcat的URI编码
-    uri-encoding: UTF-8
-    # tomcat最大线程数，默认为200
-    max-threads: 800
-    # Tomcat启动初始化的线程数，默认值25
-    min-spare-threads: 30
- 
-# 日志配置
-logging:
-  level:
-    com.tzy: debug
-    org.springframework: warn
-  fluentd:
-    enabled: ${FLUENTD_ENABLED:false}
-    host: ${FLUENTD_HOST:127.0.0.1}
-    port: ${FLUENTD_PORT:24225}
-
-# 用户配置
-user:
-  password:
-    # 密码错误{maxRetryCount}次锁定10分钟
-    maxRetryCount: 5
-
-# Spring配置
-spring:
-#静态资源访问
-  resources:
-    static-locations: classpath:/static/,file:/app/data/uploadPath,file:F://tomcat//card//uploadPath
-  # 模板引擎
-  thymeleaf:
-    mode: HTML
-    encoding: utf-8
-    # 禁用缓存
-    cache: false
-  # 资源信息
-  messages:
-    # 国际化资源文件路径
-    basename: static/i18n/messages
-  jackson:
-    time-zone: GMT+8
-    date-format: yyyy-MM-dd HH:mm:ss
-  profiles: 
-    active: druid
-  # 文件上传
-  servlet:
-     multipart:
-       # 单个文件大小
-       max-file-size:  10MB
-       # 设置总上传的文件大小
-       max-request-size:  20MB
-  # 服务模块
-  devtools:
-    restart:
-      # 热部署开关
-      enabled: true
-  redis:
-      database: 1
-      host: ${REDIS_HOST:172.29.19.234}
-      port: ${REDIS_PORT:6379}
-      password: #Tencheer456!    # 密码（默认为空）
-
-
-      timeout: 6000  # 连接超时时长（毫秒）
-      pool:
-        max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
-        max-wait: -1ms    # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-idle: 10      # 连接池中的最大空闲连接
-        min-idle: 5       # 连接池中的最小空闲连接    
-# MyBatis
-mybatis:
-    # 搜索指定包别名
-    typeAliasesPackage: com.tzy.**.domain
-    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml
-    # 加载全局的配置文件
-    configLocation: classpath:mybatis/mybatis-config.xml
-
-# PageHelper分页插件
-pagehelper: 
-  helperDialect: postgresql
-  reasonable: true
-  supportMethodsArguments: true
-  params: count=countSql 
-
-# Shiro
-shiro:
-  user:
-    # 登录地址
-    loginUrl: /login
-    # 权限认证失败地址
-    unauthorizedUrl: /unauth
-    # 首页地址
-    indexUrl: /index
-    # 验证码开关
-    captchaEnabled: false
-    # 验证码类型 math 数组计算 char 字符
-    captchaType: math
-  cookie:
-    # 设置Cookie的域名 默认空，即当前访问的域名
-    domain: 
-    # 设置cookie的有效访问路径
-    path: /
-    # 设置HttpOnly属性
-    httpOnly: true
-    # 设置Cookie的过期时间，天为单位
-    maxAge: 30
-    # 设置密钥，务必保持唯一性（生成方式，直接拷贝到main运行即可）KeyGenerator keygen = KeyGenerator.getInstance("AES"); SecretKey deskey = keygen.generateKey(); System.out.println(Base64.encodeToString(deskey.getEncoded()));
-    cipherKey: zSyK5Kp6PZAAjlT+eeNMlg==
-  session:
-    # Session超时时间，-1代表永不过期（默认30分钟）
-    expireTime: 480
-    # 同步session到数据库的周期（默认1分钟）
-    dbSyncPeriod: 1
-    # 相隔多久检查一次session的有效性，默认就是10分钟
-    validationInterval: 10
-    # 同一个用户最大会话数，比如2的意思是同一个账号允许最多同时两个人登录（默认-1不限制）
-    maxSession: -1
-    # 踢出之前登录的/之后登录的用户，默认踢出之前登录的用户
-    kickoutAfter: false
-
-# 防止XSS攻击
-xss: 
-  # 过滤开关
-  enabled: true
-  # 排除链接（多个用逗号分隔）
-  excludes: /system/notice/*
-  # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*,/base/*,/api/*
-
-# Swagger配置
-swagger:
-  # 是否开启swagger
-  enabled: true
-
-pay:
-#微信支付
-  wxpay:
-    app:
-      appID: wx10bd35e2ea404835
-      appletID: wx10bd35e2ea404835
-      thirdAndriID: wx22a7349c29e688d4
-      mchID: 1612475613
-      key: 123456789123456789123456789abcdd
-      #微信商户平台下载的安全证书存放路径
-      certPath: /app/configs/apiclient_cert.p12
-      #微信支付成功的回调地址
-      payNotifyUrl: https://m.hobbystocks.cn/api/wx/paymentBack
-      #微信退款结果回调地址
-      refundNotifyUrl: https://m.hobbystocks.cn/api/wx/refundBack
-  alipay:
-    app:
-      appId: 2021002181669560
-      privateKey: 
-      alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgCIKpTwnnPm2D1IsMlTvuCq3WBAZKm8IaUqR/IxqQAzwEVuW0+lf6Ririm4PLNcU5eZXK7w+oHqi23b7rL5htqz1K0/q/oBHEeAliCNX+zMr+6sTBN33i5yX/buvVmBPGJJg791lFdnnnELGqZf+nQrJBlOAW/aCVTga7hcf8CH/ZRDboExzf9zK5N6qcxKexsgXZRZso+d47DcAj3sF1lAcYQvTAOG+aJRcwBFFOrb3QYZI1WLOZdjq3kdhXUuVrR8HhQ68BRIvfJGX7Hwy4Ffmb9hD/ljkT1S6+jzslMp3cMbU4IlJPF0o9xxCz4KWiW0pWhwQTolNVqW3GyHG2wIDAQAB
-      privateKeyPath: /app/configs/privatekey.txt
-      #支付宝支付成功的回调地址
-      payNotifyUrl: https://m.hobbystocks.cn/api/ali/paymentBack
-      refundNotifyUrl: https://m.hobbystocks.cn/api/ali/refundBack
-wx:
-  default_avatar: https://static.public.hobbystock.cn/applet/share/share_logo2.png
-  applet:
-    lives:
-      # 直播认证二维码
-      authUrl: https://res.wx.qq.com/op_res/9rSix1dhHfK4rR049JL0PHJ7TpOvkuZ3mE0z7Ou_Etvjf-w1J_jVX0rZqeStLfwh
-
-#手机验证码
-phone:
-    verification_code_uri: http://coresvc/api/verification/code/
-authenticate:
-    url: http://coresvc/api/auth/
-#物流
-express:
-  sf:
-    client_code: LSSWCkEipb #顾客编码
-    check_word: 98vtuFMv6FQabirYZ3LD0OhI1fspjc4Z #校验码
-    box_url: https://sfapi-sbox.sf-express.com/std/service #沙箱环境的地址
-    url: https://sfapi.sf-express.com/std/service #生产环境的地址

tyz-admin/mock/configmap/privatekey.txt

@@ -1 +0,0 @@
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCAxgc1joj5s/fZNwL48tMJf1QYU0Uth5kuvzkmIUmFJqxA5F4gQRUoq3XZXpkF/eNArrVfXNAOcqFFutjJ1+RUHEiSrkaQPNAq1sCP5H9ZKhHaMP8x1XyOrgYViSQ/r8hnuLRCkbVc3+kkQNf8L0j724Sxiby7PUFl2WxAe6xcNL04Viv6HOzsYSS0sBAJWRNZBPPMLREcmxv/fZe2zOA1xM+4J6IhJbkOSzupJy96keJWisYmTqjxas7q0RkqyabwyTcfkRzDv6kf4qAK5S1nTpD8iva0V7dLwBMjNcy0lmkCDDDhF00jQYpSYi7gc1Gk1/xfdWVrvsvXSO7fCsnFAgMBAAECggEAc4k5DqRD4UXHKexhjlrPXcYP/YM4nhD7LyYCcGONQxnfkplSmj3KbiLoKY7mXKneKzqVIGp1gYD3kUiDGRXKlmyJ8JDMXr0xSD5FptSsLaPBQLKVRHD2wE0CyG+zRjDA7c6abN+uiRWcaBqFro3+PXpHI8Mgwh3Df04EAhb0HgUk1XZbvRNN2VfEqKNgv3QrVzu0Sh1JWszrrMEo4izxcF9MkOVFedJmKTsC+C8BnWjwlmFGlEgkqbVNAfkTLR6jn3A6hyVQ//nDp7w3/l/G8o7aUrnG5UDyLfVR7cB/asp5oIHKaZfjvR/9r6e0UXtK0l0wEi4b4tG6O2feztrGQQKBgQDlIk4W14wEdbF564/oNLAG7YFqyDIfnNQEHiMyZczYIXd5eugacAieCNUjGQGWDXxZrBRreXPmwjMmLj//ByBZsN3ykHqt4DT2N+g3Hrl11K2TjJEEIQw1zYB294kfKCUYqtJZ3g4SyGOyqCxOpWd42hS9Lv9KkpanXXPbqScScwKBgQCP30zDD42WI+fkLwDEjZX8ABFQAimH3Ay5lp8x9mq8F5KpaYs4+us6qnr9GmnA8FjVgO/ar5OqoaAMzl+NML/eSjY/guXYQtv54g7AcFnytC3+wQrnFfFVZzpi08DSa0+mHSZJn1e/CP//lN7+JPc+Xcef8xlTjB+WUAb6CLVM5wKBgQCWm67iWrmg8M9ACTLk+US+uPw4+O/hUY8WSczuwnUblxvV0JChWASCA+I8mKIvRBv5QR+G6STih8FhFkNgWQnNinDIkGjiwx1svaC4IkzbA3k4I8vp/+LrtnD7QYdy4EtJ5HYxNcDgXbESbHH7G8Ngb0/0beDF3oaB6e5OcufIuwKBgDx5xK6Jrx5ZYXRNPalhSpZvANf80LBHEyI/6hL6XctKrV+A+gCtmItEdgZGQAXWAcFdPXVTMGMdJUW8yfVzdHNgBoWT5EGPeSAEoebKU0Tt8BeR1Z9lXdhkV+qK0Bai/Qv6XMm9rQikI9evIDz8FOGmUe8uJIs172EjqosXdf4pAoGBAMC0CJ93guzXLXdd5R2EFk0SCuK9LTBPXOzxpHVu2ZzRVw8UIApojnz0xhccxBZh02+mb/pQWMW8sXuvdjJUZLAeLPyzJ9r3lc5EUbBbc2mbJ7k/5zzI+e5uL5yChhTsaFZtSfurh+l3k559Xc+LAFjlmNOvT7KygsuR7QccXs5o