From a9df92abb5354d21ab62f61583b8fe14c375f71c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 29 一月 2024 08:27:13 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java | 18 ++++++++----------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/BeanConfig.java | 2 +-
zy-asrs-wcs/src/main/resources/application.yml | 15 ++++++++-------
3 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/BeanConfig.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/BeanConfig.java
index 44f6c4d..2fefe76 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/BeanConfig.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/BeanConfig.java
@@ -7,6 +7,6 @@
* Created by vincent on 12/19/2023
*/
@Configuration
-@ComponentScan(value = "com.zy.asrs.common")
+@ComponentScan(value = "com.zy.asrs.common.config")
public class BeanConfig {
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
index ecefea2..5a5ea53 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
@@ -11,19 +11,17 @@
public static void main(String[] args) throws Exception {
CoolGenerator generator = new CoolGenerator();
- // mysql
-// generator.url="localhost:3306/cool";
-// generator.username="root";
-// generator.password="xltys1995";
-// generator.table="sys_host";
- // sqlserver
- generator.sqlOsType = SqlOsType.SQL_SERVER;
generator.backendPrefixPath = "zy-asrs-wcs/";
generator.frontendPrefixPath = "zy-asrs-wcs/";
- generator.url="47.97.1.152:51433;databasename=jkasrs";
- generator.username="sa";
- generator.password="Zoneyung@zy56$";
+ generator.sqlOsType = SqlOsType.MYSQL;
+ generator.url="localhost:3306/asrs";
+ generator.username="root";
+ generator.password="xltys1995";
+// generator.url="47.97.1.152:51433;databasename=jkasrs";
+// generator.username="sa";
+// generator.password="Zoneyung@zy56$";
+
generator.table="rcs_host";
generator.packagePath="com.zy.asrs.wcs.sys";
diff --git a/zy-asrs-wcs/src/main/resources/application.yml b/zy-asrs-wcs/src/main/resources/application.yml
index b029d18..08e1c35 100644
--- a/zy-asrs-wcs/src/main/resources/application.yml
+++ b/zy-asrs-wcs/src/main/resources/application.yml
@@ -9,13 +9,14 @@
jmx:
enabled: false
datasource:
- driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- # url: jdbc:sqlserver://localhost:1433;databasename=jmasrs
- # username: sa
- # password: sa@123
- url: jdbc:sqlserver://47.97.1.152:51433;databasename=jkasrs
- username: sa
- password: Zoneyung@zy56$
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://localhost:3306/zy_acs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: root
+ password: xltys1995
+# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+# url: jdbc:sqlserver://47.97.1.152:51433;databasename=jkasrs
+# username: sa
+# password: Zoneyung@zy56$
mvc:
static-path-pattern: /**
servlet:
--
Gitblit v1.9.1