优化项目目录以及dockerfile层级

.beagle.yml

@@ -5,7 +5,6 @@ trigger:
   branch:
     - master
 
-
 volumes:
   - name: docker
     host:
@@ -18,6 +17,7 @@ steps:
   - name: fetch
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-git:1.0
     network_mode: host
+
   - name: docker-amd64
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
     volumes:
@@ -50,17 +50,6 @@ steps:
       registry_password:
         from_secret: REGISTRY_PASSWORD_ALIYUN
 
-  - name: docker-arch
-    image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-manifest:1.0
-    settings:
-      platforms: linux/amd64,linux/arm64
-      template: registry.cn-qingdao.aliyuncs.com/wod/bdg-web-server:v3-optimize
-      target: registry.cn-qingdao.aliyuncs.com/wod/bdg-web-server:v3-optimize
-      username:
-        from_secret: REGISTRY_USER_ALIYUN
-      password:
-        from_secret: REGISTRY_PASSWORD_ALIYUN
-
 ---
 kind: secret
 name: REGISTRY_USER_ALIYUN

.beagle/dockerfile

@@ -4,10 +4,6 @@ ENV CATALINA_HOME=/home/server/tomcat/
 
 COPY ../build/package/ /home/
 
-COPY ../build/img/login_wenzi.png /home/www/ROOT/WEB-INF/classes/static/img/login_wenzi.png
-
-COPY ../build/conf/application-druid.yml /home/www/ROOT/WEB-INF/classes/application-druid.yml
-
 RUN  mkdir -p /home/logs && \
      cp -a /etc/apt/sources.list /etc/apt/sources.list.bak && \
      echo "deb https://mirrors.tencent.com/debian/ bullseye main non-free contrib \n\

build/conf/application-druid.yml

-# 数据源配置
-spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            # 主库数据源
-            master:
-                url: jdbc:mysql://192.168.192.100:3306/bdg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true
-                username: root
-                password: root
-            # 从库数据源
-            slave:
-                # 从数据源开关/默认关闭
-                enabled: false
-                url:
-                username:
-                password:
-            # 设置连接池隔离级别，1: Read Uncommitted未提交读，2: Read Committed提交读, 4: Repeatable Read重复读，8: Serializable串行化
-            default-transaction-isolation: 4
-            # 初始连接数
-            initialSize: 50
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量
-            maxActive: 200
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
-
-
-            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
-            validationQuery: SELECT 1 FROM DUAL
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            webStatFilter:
-                enabled: true
-            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: ruoyi
-                login-password: 123456
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
-                        multi-statement-allow: true
-

build/package/www/ROOT/WEB-INF/classes/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://tidb-cluster-tidb.tidb-admin:4000/bdg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true
-                username: sftsxzd
-                password: sxzd#2022
+                url: jdbc:mysql://192.168.192.100:3306/bdg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true
+                username: root
+                password: root
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -59,3 +59,4 @@ spring:
                 wall:
                     config:
                         multi-statement-allow: true
+