From a597fadc2c99c0f60f0bd40200b7d1355c06b15e Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期四, 28 十一月 2024 17:09:05 +0800
Subject: [PATCH] 西宁项目，移动APP版本号
---
src/main/java/com/product/Application.java | 2 +-
src/main/resources/application-dev.properties | 9 ++++++---
pom.xml | 28 +++++++++++++++++-----------
3 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 11a248c..7f7fd4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,10 @@
<groupId>com.lx</groupId>
<artifactId>product-server-mq</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-hr</artifactId>
+ </dependency>
<!--闄勪欢绠＄悊銆佹枃妗ｇ鐞�-->
<dependency>
<groupId>com.lx</groupId>
@@ -166,16 +170,14 @@
</dependency>
<!--椤圭洰绠＄悊妯″潡-->
- <!-- <dependency>-->
- <!-- <groupId>com.lx</groupId>-->
- <!-- <artifactId>product-project-server-base</artifactId>-->
- <!-- <version>1.0.0-SNAPSHOT</version>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>com.lx</groupId>-->
- <!-- <artifactId>product-project-server-contract</artifactId>-->
- <!-- <version>1.0.0-SNAPSHOT</version>-->
- <!-- </dependency>-->
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-project-server-base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-project-server-contract</artifactId>
+ </dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-customer</artifactId>
@@ -188,7 +190,11 @@
<groupId>org.spring</groupId>
<artifactId>spring-server-master</artifactId>
</dependency>
-
+ <!--瑗垮畞-->
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-xining</artifactId>
+ </dependency>
<dependency>
<groupId>com.sendgrid</groupId>
<artifactId>sendgrid-java</artifactId>
diff --git a/src/main/java/com/product/Application.java b/src/main/java/com/product/Application.java
index f21ec16..8095a02 100644
--- a/src/main/java/com/product/Application.java
+++ b/src/main/java/com/product/Application.java
@@ -26,7 +26,7 @@
* 鍒濆闆嗙兢瀹㈡埛绔繛鎺ユ睜
* 鎵弿澶氫釜璺緞
*/
-@SpringBootApplication(exclude = DataSourceAutoConfiguration.class, scanBasePackages = {"com.product", "org.spring.service.core"})
+@SpringBootApplication(exclude = DataSourceAutoConfiguration.class, scanBasePackages = {"com.product", "com.home","org.spring.service.core"})
public class Application extends SpringBootServletInitializer {
@Override
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index bfb179a..966151e 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -75,9 +75,9 @@
data.source.type=mysql
data.source.driver=com.mysql.jdbc.Driver
#################local###############################
-#data.source.url=jdbc:mysql://192.168.0.200:3308/product_db_xn?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
-data.source.url=jdbc:mysql://192.168.0.200:3308/product_db_v3.0.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
-#data.source.url=jdbc:mysql://222.209.52.184:3005/product_db_v3.0.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
+data.source.url=jdbc:mysql://192.168.0.200:3308/product_db_xn?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
+#data.source.url=jdbc:mysql://192.168.0.200:3308/product_db_v3.0.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
+#data.source.url=jdbc:mysql://127.0.0.1:3306/product_db_v3.0.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
#data.source.url=jdbc:mysql://222.209.28.250:3005/product_db_lift?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useNewIO=true&useSSL=false&serverTimezone=Asia/Shanghai
data.source.user=root
data.source.password=root123
@@ -307,3 +307,6 @@
server.tomcat.max-threads=200
server.tomcat.max-connections=1000
server.tomcat.max-http-header-size=1024KB
+mobile.apk.version=3.0.0
+
+
--
Gitblit v1.9.2