Merge branch 'dev' into 'main'

Dev

See merge request !89

.gitlab-ci.yml

 variables:
   MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
   MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true -Dmaven.test.skip=true"
-  USERNAME: eazytec #hub.eazytec-cloud.com用户名
-  TOKEN: Eazytec2023  #hub.eazytec-cloud.com的CLI密码
-  REPO: hub.eazytec-cloud.com  #hub.eazytec-cloud.com的地址
-  NAMESPACE: yichengstreet        #项目名
+  USERNAME: yx-street #hub.eazytec-cloud.com用户名
+  TOKEN: xUSFbdB95yVRr$WW  #hub.eazytec-cloud.com的CLI密码
+  REPO: 47.103.57.78:30002  #hub.eazytec-cloud.com的地址
+  NAMESPACE: yx-street        #项目名
   IMAGE: yichengstreet-be         #项目英文名
   OKD: osr.eazytec.intra:8443  #pass平台的地址
   OKDUSER: sunf@eazytec.com #pass平台的用户名
@@ -20,7 +20,7 @@ cache:
 stages:
   - package
   - deploy
-  - publish
+#   - publish
 
 
 package:

Dockerfile

-FROM hub.eazytec-cloud.com/eazytec/openjdk8-fonts:latest
+FROM 47.103.57.78:30002/eazytec/openjdk8-fonts:latest
 
 LABEL maintainer="sunf sunf@eazytec.com"
 

ruoyi-admin/src/main/resources/application-dev.yml

@@ -73,12 +73,12 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.31.185
+    host: redis-test.yx-street.svc.cluster.local
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 4
-    password: P@44w0rd
+    password: digital
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -97,16 +97,16 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://192.168.70.2:3306/yichengstreet?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+        url: jdbc:mysql://mysql-test.yx-street.svc.cluster.local:3306/yichengstreet?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
         username: root
-        password: Zhuo@2023
+        password: P@44w0rd
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
         enabled: true
-        url: jdbc:mysql://192.168.70.2:3306/yichengstreet-party?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+        url: jdbc:mysql://mysql-test.yx-street.svc.cluster.local:3306/yichengstreet-party?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
         username: root
-        password: Zhuo@2023
+        password: P@44w0rd
       # 初始连接数
       initialSize: 5
       # 最小连接池数量