diff --git a/.beagle.yml b/.beagle.yml index c6b78e4a547919144c900db7f6c3aade77c1bc49..4689de75f30f56d7377756002bc210321a9c50ba 100644 --- a/.beagle.yml +++ b/.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 diff --git a/.beagle/dockerfile b/.beagle/dockerfile index ba3a475fcbd32976d95c6b4443a7ebf136858d2a..46ab9cd0f7fa0f0d1e0a161d9d1f007926b3cabd 100644 --- a/.beagle/dockerfile +++ b/.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\ @@ -26,4 +22,4 @@ RUN mkdir -p /home/logs && \ CMD /home/server/tomcat/bin/startup.sh && \ sleep 5s && \ - tail -f /home/server/tomcat/logs/catalina.out \ No newline at end of file + tail -f /home/server/tomcat/logs/catalina.out diff --git a/build/conf/application-druid.yml b/build/conf/application-druid.yml deleted file mode 100644 index ab81017836dc91a3af9e0364188ff495019dfdb0..0000000000000000000000000000000000000000 --- a/build/conf/application-druid.yml +++ /dev/null @@ -1,62 +0,0 @@ -# 数据源配置 -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 - diff --git a/build/img/login_wenzi.png b/build/img/login_wenzi.png deleted file mode 100644 index 65b6158b1fcb99ea40baa04a764853b7a349b9a6..0000000000000000000000000000000000000000 Binary files a/build/img/login_wenzi.png and /dev/null differ diff --git a/build/package/www/ROOT/WEB-INF/classes/application-druid.yml b/build/package/www/ROOT/WEB-INF/classes/application-druid.yml index 3d2fdf0c1f809aa3e7be7ef9f03e067da589c30b..ab81017836dc91a3af9e0364188ff495019dfdb0 100644 --- a/build/package/www/ROOT/WEB-INF/classes/application-druid.yml +++ b/build/package/www/ROOT/WEB-INF/classes/application-druid.yml @@ -1,61 +1,62 @@ -# 数据源配置 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver - 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 - # 从库数据源 - 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 +# 数据源配置 +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 + diff --git a/build/package/www/ROOT/WEB-INF/classes/static/img/login_wenzi.png b/build/package/www/ROOT/WEB-INF/classes/static/img/login_wenzi.png index 20167128371c0854dec7a172c5802cd8f29808d8..65b6158b1fcb99ea40baa04a764853b7a349b9a6 100644 Binary files a/build/package/www/ROOT/WEB-INF/classes/static/img/login_wenzi.png and b/build/package/www/ROOT/WEB-INF/classes/static/img/login_wenzi.png differ