配置

.gitignore

@@ -0,0 +1,44 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+nbproject/private/
+build/*
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml
+nacos

report-core/pom.xml

@@ -37,7 +37,7 @@
                 <!-- Docker 配置 -->
                 <docker.dockerHost>http://172.16.90.64:22375</docker.dockerHost>
 <!--                <docker.serviceId>DockerHub</docker.serviceId>-->
-                <docker.image.version>1.0.0</docker.image.version>
+                <docker.image.version>1.0.4</docker.image.version>
             </properties>
         </profile>
         <profile>

report-core/src/main/docker/Dockerfile

@@ -5,4 +5,4 @@ VOLUME /tmp
 # VOLUME /logs
 COPY aj-report-2.0.2.RELEASE.jar app.jar
 # ENV JAVA_OPTS=""
-CMD ["java","-Djava.security.egd=file:/dev/./urandom", "-Xms512m", "-Xmx2048m","-jar","app.jar"]
+CMD ["java","-Djava.security.egd=file:/dev/./urandom", "-Xms512m", "-Xmx1024m","-jar","app.jar"]

report-core/src/main/resources/bootstrap-dev.yml

@@ -1,7 +1,7 @@
 # 该文件配置会继承bootstrap.xml，只需要配置数据库等差异配置
 spring:
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/aj_report?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
+    url: jdbc:mysql://172.16.90.201:3306/aj_report?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
     username: root
     password: 123456
 

report-core/src/main/resources/bootstrap-prod.yml

@@ -1,9 +1,9 @@
 # 该文件配置会继承bootstrap.xml，只需要配置数据库等差异配置
 spring:
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/report?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
-    username: report
-    password: 123456
+    url: jdbc:mysql://192.168.1.102:3306/aj_report?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
+    username: report_db
+    password: mE5xtKKES7MA84Tk
 
 customer:
   file:

report-core/src/main/resources/bootstrap.yml

@@ -18,10 +18,6 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
   messages:
     basename: i18n/messages
-  datasource:
-    url: jdbc:mysql://172.16.90.201:3306/aj_report?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
-    username: root
-    password: 123456
   #数据源连接池配置
   druid:
     initial-size: 10 # 初始化时建立物理连接的个数。初始化发生在显示调用init方法，或者第一次getConnection时