Merge remote-tracking branch 'origin/main'

Jenkinsfile

@@ -1,20 +1,24 @@
 pipeline {
     agent any
     stages {
+        stage('Stop') {
+            steps {
+                sh 'sh /var/lib/jenkins/workspace/stop.sh'
+            }
+        }
         stage('Build') {
             steps {
                 sh 'mvn -B -DskipTests clean install'
             }
         }
-        stage('Test'){
+        stage('Start') {
             steps {
-                sh 'java -jar /var/lib/jenkins/workspace/alysisSystemForRadionuclide_main/jeecg-module-system/jeecg-system-start/target/jeecg-system-start-3.5.1.jar'
+                    // 解决Jenkins构建完毕之后会杀死所有衍生进程问题
-            }
+                    withEnv(['JENKINS_NODE_COOKIE=dontkillme']) {
-        }
+                        sh 'sh /var/lib/jenkins/workspace/start.sh'
-        stage('Deploy') {
-            steps {
-                sh 'echo publish'
                     }
             }
         }
     }
+}
+

db/test.sql

@@ -1 +0,0 @@
-1234rt

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -136,17 +136,17 @@ spring:
           password: 123456
           driver-class-name: com.mysql.cj.jdbc.Driver
         # 多数据源配置
-        ora:
+#        ora:
-          url: jdbc:oracle:thin:@192.168.8.139:1521:ORCL
+#          url: jdbc:oracle:thin:@192.168.8.139:1521:ORCL
-          username: configuration
+#          username: configuration
-          password: 123456
+#          password: 123456
-          driver-class-name: oracle.jdbc.OracleDriver
+#          driver-class-name: oracle.jdbc.OracleDriver
   #redis 配置
   redis:
     database: 0
     host: 127.0.0.1
     port: 6379
-    password: ''
+    #password: ''
 #mybatis plus 设置
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml