From 355bd526866ff6c3874fb6013a7424a462a21140 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期三, 29 三月 2023 11:16:30 +0800
Subject: [PATCH] init
---
ZuulTravel/src/main/resources/application.yml | 4 +-
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/ManagementApplication.java | 6 +-
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java | 4 +-
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java | 2
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java | 4 +-
DriverTravel/guns-admin/src/main/resources/application.yml | 12 +++---
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/UserApplication.java | 8 +--
UserTravel/guns-admin/src/main/resources/application.yml | 6 +-
DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/DispatchApplication.java | 8 +---
DispatchTravel/guns-admin/src/main/resources/application.yml | 6 +-
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/UserServletInitializer.java | 4 +-
ManagementTravel/guns-admin/src/main/resources/application.yml | 12 +++---
/dev/null | 18 ---------
ManagementTravel/guns-admin/pom.xml | 1
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/DriverApplication.java | 6 +-
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java | 1
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/ManagementServletInitializer.java | 4 +-
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java | 4 +-
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/DriverServletInitializer.java | 4 +-
19 files changed, 45 insertions(+), 69 deletions(-)
diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/DispatchApplication.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/DispatchApplication.java
index 906c34c..5e24152 100644
--- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/DispatchApplication.java
+++ b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/DispatchApplication.java
@@ -31,12 +31,8 @@
private final static Logger logger = LoggerFactory.getLogger(DispatchApplication.class);
public static void main(String[] args) {
- try {
- TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
- SpringApplication.run(DispatchApplication.class, args);
- }catch (Exception e){
- e.printStackTrace();
- }
+ TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
+ SpringApplication.run(DispatchApplication.class, args);
logger.info("GunsApplication is success!");
}
diff --git a/DispatchTravel/guns-admin/src/main/resources/application.yml b/DispatchTravel/guns-admin/src/main/resources/application.yml
index 7e49616..abf92a4 100644
--- a/DispatchTravel/guns-admin/src/main/resources/application.yml
+++ b/DispatchTravel/guns-admin/src/main/resources/application.yml
@@ -37,7 +37,7 @@
eureka:
client:
service-url: #注册中心地址
- defaultZone: http://127.0.0.1:8081/eureka #启用身份验证的方式连接
+ defaultZone: http://sinata:sinata@127.0.0.1:8081/eureka #启用身份验证的方式连接
register-with-eureka: true #在注册中心进行注册
fetch-registry: true #从Eureka中获取注册信息。
@@ -59,9 +59,9 @@
spring:
datasource:
- url: jdbc:mysql://139.9.249.67:3306/jyxtravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: root
+ password: 123456
db-name: guns #用来搜集数据库的所有表
filters: wall,mergeStat
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/DriverApplication.java
similarity index 97%
rename from DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
rename to DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/DriverApplication.java
index 7210cbb..55ef9b9 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/DriverApplication.java
@@ -34,13 +34,13 @@
@SpringBootApplication
@EnableScheduling//开启定时任务
@EnableTransactionManagement//启动事务功能
-public class GunsApplication {
+public class DriverApplication {
- private final static Logger logger = LoggerFactory.getLogger(GunsApplication.class);
+ private final static Logger logger = LoggerFactory.getLogger(DriverApplication.class);
public static void main(String[] args) {
TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
- SpringApplication.run(GunsApplication.class, args);
+ SpringApplication.run(DriverApplication.class, args);
logger.info("GunsApplication is success!");
GDFalconUtil gdFalconUtil = new GDFalconUtil();
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/DriverServletInitializer.java
similarity index 73%
copy from DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java
copy to DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/DriverServletInitializer.java
index 18e63c5..58035f3 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/DriverServletInitializer.java
@@ -9,10 +9,10 @@
* @author fengshuonan
* @date 2017-05-21 9:43
*/
-public class GunsServletInitializer extends SpringBootServletInitializer {
+public class DriverServletInitializer extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
- return builder.sources(GunsApplication.class);
+ return builder.sources(DriverApplication.class);
}
}
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java
index 1cebee4..4a02f3e 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java
@@ -1,7 +1,7 @@
package com.stylefeng.guns.modular.code.factory;
-import com.stylefeng.guns.GunsApplication;
+import com.stylefeng.guns.DriverApplication;
import com.stylefeng.guns.core.CoreFlag;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.generator.action.model.GenQo;
@@ -44,7 +44,7 @@
GenQo genQo = new GenQo();
genQo.setProjectPath(ToolUtil.getWebRootPath(null));
genQo.setAuthor("stylefeng");
- genQo.setProjectPackage(GunsApplication.class.getPackage().getName());
+ genQo.setProjectPackage(DriverApplication.class.getPackage().getName());
genQo.setCorePackage(CoreFlag.class.getPackage().getName());
genQo.setIgnoreTabelPrefix("sys_");
genQo.setModuleName("system");
diff --git a/DriverTravel/guns-admin/src/main/resources/application.yml b/DriverTravel/guns-admin/src/main/resources/application.yml
index cbc4efb..f609479 100644
--- a/DriverTravel/guns-admin/src/main/resources/application.yml
+++ b/DriverTravel/guns-admin/src/main/resources/application.yml
@@ -42,7 +42,7 @@
eureka:
client:
service-url: #注册中心地址
- defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接
+ defaultZone: http://sinata:sinata@127.0.0.1:8081/eureka #启用身份验证的方式连接
register-with-eureka: true #在注册中心进行注册
fetch-registry: true #从Eureka中获取注册信息。
@@ -58,10 +58,10 @@
spring:
datasource:
- url: jdbc:mysql://127.0.0.1:3306/jyxtravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: root
- db-name: jyxtravel #用来搜集数据库的所有表
+ password: 123456
+ db-name: kuanzhaiyx #用来搜集数据库的所有表
filters: wall,mergeStat
#spring:
@@ -76,9 +76,9 @@
guns:
muti-datasource:
open: false
- url: jdbc:mysql://127.0.0.1:3306/guns_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: root
+ password: 123456
dataSourceNames:
- dataSourceGuns
- dataSourceBiz
diff --git a/ManagementTravel/guns-admin/pom.xml b/ManagementTravel/guns-admin/pom.xml
index c0253e4..22ecac4 100644
--- a/ManagementTravel/guns-admin/pom.xml
+++ b/ManagementTravel/guns-admin/pom.xml
@@ -179,6 +179,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
+ <version>1.18.26</version>
</dependency>
<dependency>
diff --git a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java
deleted file mode 100644
index 18e63c5..0000000
--- a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.stylefeng.guns;
-
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-/**
- * Guns Web程序启动类
- *
- * @author fengshuonan
- * @date 2017-05-21 9:43
- */
-public class GunsServletInitializer extends SpringBootServletInitializer {
-
- @Override
- protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
- return builder.sources(GunsApplication.class);
- }
-}
diff --git a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/ManagementApplication.java
similarity index 94%
rename from ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
rename to ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/ManagementApplication.java
index 502394a..fea448c 100644
--- a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
+++ b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/ManagementApplication.java
@@ -25,12 +25,12 @@
*/
@EnableScheduling//开启定时任务
@SpringBootApplication
-public class GunsApplication {
+public class ManagementApplication {
- private final static Logger logger = LoggerFactory.getLogger(GunsApplication.class);
+ private final static Logger logger = LoggerFactory.getLogger(ManagementApplication.class);
public static void main(String[] args) {
- SpringApplication.run(GunsApplication.class, args);
+ SpringApplication.run(ManagementApplication.class, args);
logger.info("GunsApplication is success!");
}
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/ManagementServletInitializer.java
similarity index 72%
copy from DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java
copy to ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/ManagementServletInitializer.java
index 18e63c5..120a124 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java
+++ b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/ManagementServletInitializer.java
@@ -9,10 +9,10 @@
* @author fengshuonan
* @date 2017-05-21 9:43
*/
-public class GunsServletInitializer extends SpringBootServletInitializer {
+public class ManagementServletInitializer extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
- return builder.sources(GunsApplication.class);
+ return builder.sources(ManagementApplication.class);
}
}
diff --git a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java
index 1cebee4..19daddb 100644
--- a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java
+++ b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java
@@ -1,7 +1,7 @@
package com.stylefeng.guns.modular.code.factory;
-import com.stylefeng.guns.GunsApplication;
+import com.stylefeng.guns.ManagementApplication;
import com.stylefeng.guns.core.CoreFlag;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.generator.action.model.GenQo;
@@ -44,7 +44,7 @@
GenQo genQo = new GenQo();
genQo.setProjectPath(ToolUtil.getWebRootPath(null));
genQo.setAuthor("stylefeng");
- genQo.setProjectPackage(GunsApplication.class.getPackage().getName());
+ genQo.setProjectPackage(ManagementApplication.class.getPackage().getName());
genQo.setCorePackage(CoreFlag.class.getPackage().getName());
genQo.setIgnoreTabelPrefix("sys_");
genQo.setModuleName("system");
diff --git a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java
index 56efea8..f073b0e 100644
--- a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java
+++ b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java
@@ -12,7 +12,6 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.response.MerchantActivityVo;
import com.stylefeng.guns.modular.system.service.*;
-import io.swagger.models.auth.In;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
index ed924de..a826f4f 100644
--- a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
+++ b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
@@ -11,7 +11,7 @@
// public static String ministry_of_transport_ftp = "http://120.77.11.218:8868/ftp";
- public static String zull_user_url = "http://123.56.89.63:80";
+ public static String zull_user_url = "http://127.0.0.1:5000";
public static String order_push_url = zull_user_url + "/driver/base/order/pushOrderState";
public static String driver_auth_url = zull_user_url + "/driver/base/driver/sendsms";
public static String withdraw_auth_url = zull_user_url + "/driver/base/withdrawal/withdrawalAudit";
diff --git a/ManagementTravel/guns-admin/src/main/resources/application.yml b/ManagementTravel/guns-admin/src/main/resources/application.yml
index e85fd90..5e2144b 100644
--- a/ManagementTravel/guns-admin/src/main/resources/application.yml
+++ b/ManagementTravel/guns-admin/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8010
+ port: 5004
guns:
swagger-open: true #是否开启swagger (true/false)
@@ -67,10 +67,10 @@
spring:
datasource:
- url: jdbc:mysql://127.0.0.1:3306/jyxtravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: root
- db-name: jyxtravel #用来搜集数据库的所有表
+ password: 123456
+ db-name: kuanzhaiyx #用来搜集数据库的所有表
filters: wall,mergeStat
@@ -79,10 +79,10 @@
guns:
muti-datasource:
open: false
- url: jdbc:mysql://120.24.34.190:3306/mask?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+ url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
username: root
# password: Root2020!
- password: root
+ password: 123456
dataSourceNames:
- dataSourceGuns
- dataSourceBiz
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java
deleted file mode 100644
index 18e63c5..0000000
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.stylefeng.guns;
-
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-/**
- * Guns Web程序启动类
- *
- * @author fengshuonan
- * @date 2017-05-21 9:43
- */
-public class GunsServletInitializer extends SpringBootServletInitializer {
-
- @Override
- protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
- return builder.sources(GunsApplication.class);
- }
-}
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/UserApplication.java
similarity index 92%
rename from UserTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
rename to UserTravel/guns-admin/src/main/java/com/stylefeng/guns/UserApplication.java
index 59daec1..561b8d3 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/UserApplication.java
@@ -8,8 +8,6 @@
import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.context.annotation.Bean;
@@ -32,13 +30,13 @@
@SpringBootApplication
@EnableScheduling//开启定时任务
@EnableTransactionManagement//启动事务功能
-public class GunsApplication /*extends SpringBootServletInitializer*/ {
+public class UserApplication /*extends SpringBootServletInitializer*/ {
- private final static Logger logger = LoggerFactory.getLogger(GunsApplication.class);
+ private final static Logger logger = LoggerFactory.getLogger(UserApplication.class);
public static void main(String[] args) {
TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
- SpringApplication.run(GunsApplication.class, args);
+ SpringApplication.run(UserApplication.class, args);
logger.info("GunsApplication is success!");
}
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/UserServletInitializer.java
similarity index 76%
rename from DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java
rename to UserTravel/guns-admin/src/main/java/com/stylefeng/guns/UserServletInitializer.java
index 18e63c5..0107778 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/UserServletInitializer.java
@@ -9,10 +9,10 @@
* @author fengshuonan
* @date 2017-05-21 9:43
*/
-public class GunsServletInitializer extends SpringBootServletInitializer {
+public class UserServletInitializer extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
- return builder.sources(GunsApplication.class);
+ return builder.sources(UserApplication.class);
}
}
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java
index 1cebee4..2b7119c 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java
@@ -1,7 +1,7 @@
package com.stylefeng.guns.modular.code.factory;
-import com.stylefeng.guns.GunsApplication;
+import com.stylefeng.guns.UserApplication;
import com.stylefeng.guns.core.CoreFlag;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.generator.action.model.GenQo;
@@ -44,7 +44,7 @@
GenQo genQo = new GenQo();
genQo.setProjectPath(ToolUtil.getWebRootPath(null));
genQo.setAuthor("stylefeng");
- genQo.setProjectPackage(GunsApplication.class.getPackage().getName());
+ genQo.setProjectPackage(UserApplication.class.getPackage().getName());
genQo.setCorePackage(CoreFlag.class.getPackage().getName());
genQo.setIgnoreTabelPrefix("sys_");
genQo.setModuleName("system");
diff --git a/UserTravel/guns-admin/src/main/resources/application.yml b/UserTravel/guns-admin/src/main/resources/application.yml
index bae7c28..3eb60f0 100644
--- a/UserTravel/guns-admin/src/main/resources/application.yml
+++ b/UserTravel/guns-admin/src/main/resources/application.yml
@@ -64,10 +64,10 @@
spring:
datasource:
- url: jdbc:mysql://127.0.0.1:3306/jyxtravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: root
- db-name: jyxtravel #用来搜集数据库的所有表
+ password: 123456
+ db-name: kuanzhaiyx #用来搜集数据库的所有表
filters: wall,mergeStat
#spring:
# datasource:
diff --git a/ZuulTravel/src/main/resources/application.yml b/ZuulTravel/src/main/resources/application.yml
index d21e043..66dfb6b 100644
--- a/ZuulTravel/src/main/resources/application.yml
+++ b/ZuulTravel/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 5000
+ port: 80
spring:
application:
@@ -8,7 +8,7 @@
eureka:
client:
service-url: #注册中心地址
- defaultZone: http://127.0.0.1:8081/eureka #启用身份验证的方式连接
+ defaultZone: http://sinata:sinata@127.0.0.1:8081/eureka #启用身份验证的方式连接
register-with-eureka: true #在注册中心进行注册
fetch-registry: true #从Eureka中获取注册信息。
--
Gitblit v1.7.1