From 70828cc9229703addc476ba470a04927175d0fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= Date: Mon, 26 Feb 2024 10:46:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0tao-api=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/pom.xml | 43 ++++++++++-------- db/qihang-oms.yaml | 45 +++++++++++++++++++ .../src/main/java/com/qihang/tao/TaoApi.java | 1 + .../qihang/tao/config/DataSourceConfig.java | 25 +++++++++++ .../com/qihang/tao/config/MyBatisConfig.java | 33 ++++++++++++++ vue3/index.html | 6 +-- vue3/src/settings.ts | 2 +- 7 files changed, 132 insertions(+), 23 deletions(-) create mode 100644 db/qihang-oms.yaml create mode 100644 tao-api/src/main/java/com/qihang/tao/config/DataSourceConfig.java create mode 100644 tao-api/src/main/java/com/qihang/tao/config/MyBatisConfig.java diff --git a/api/pom.xml b/api/pom.xml index 3ef124ab..c6cf6e5a 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -6,7 +6,12 @@ qihang-oms 1.0-SNAPSHOT - + + + + + + api jar @@ -32,11 +37,11 @@ spring-cloud-starter-alibaba-nacos-discovery ${spring-cloud-alibaba.version} - - - - - + + + + + org.springframework.cloud spring-cloud-starter-loadbalancer @@ -55,19 +60,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + io.jsonwebtoken diff --git a/db/qihang-oms.yaml b/db/qihang-oms.yaml new file mode 100644 index 00000000..2b31fa2d --- /dev/null +++ b/db/qihang-oms.yaml @@ -0,0 +1,45 @@ +spring: + # redis 配置 + redis: + # 地址 +# host: 8.130.98.215 + host: 127.0.0.1 + # 端口，默认为6379 + port: 6379 + # 数据库索引 + database: 0 + # 密码 +# password: 123321 + # 连接超时时间 + timeout: 10s + lettuce: + pool: + # 连接池中的最小空闲连接 + min-idle: 0 + # 连接池中的最大空闲连接 + max-idle: 8 + # 连接池的最大数据库连接数 + max-active: 8 + # #连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1ms + datasource: + driverClassName: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/qihang-oms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: Andy_123 + + + +# # mybatis 日志 +# mybatis-plus: +# configuration: +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 开启sql日志 + + +# minio配置 +minio: + endpoint: http://127.0.0.1:9000 #换成自己的minio服务端地址 + accessKey: 0AksAWDtI20Lpb4qxq5S + secretKey: yOAZkOVwrhPooBRel5PB0GwS5uw8VAgmqYykHl3T + secure: false + bucketName: ecerp \ No newline at end of file diff --git a/tao-api/src/main/java/com/qihang/tao/TaoApi.java b/tao-api/src/main/java/com/qihang/tao/TaoApi.java index d5ece317..2f6f736d 100644 --- a/tao-api/src/main/java/com/qihang/tao/TaoApi.java +++ b/tao-api/src/main/java/com/qihang/tao/TaoApi.java @@ -12,6 +12,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; * */ //@EnableWebSecurity +@MapperScan("com.qihang.tao.mapper") @EnableDiscoveryClient @SpringBootApplication public class TaoApi diff --git a/tao-api/src/main/java/com/qihang/tao/config/DataSourceConfig.java b/tao-api/src/main/java/com/qihang/tao/config/DataSourceConfig.java new file mode 100644 index 00000000..dc611e1a --- /dev/null +++ b/tao-api/src/main/java/com/qihang/tao/config/DataSourceConfig.java @@ -0,0 +1,25 @@ +package com.qihang.tao.config; + +import com.zaxxer.hikari.HikariDataSource; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; + +import javax.sql.DataSource; +@Configuration +public class DataSourceConfig { + @Autowired + private Environment env; + + @Bean + public DataSource dataSource() { + HikariDataSource dataSource = new HikariDataSource(); + dataSource.setDriverClassName(env.getProperty("spring.datasource.driver-class-name")); + dataSource.setJdbcUrl(env.getProperty("spring.datasource.url")); + dataSource.setUsername(env.getProperty("spring.datasource.username")); + dataSource.setPassword(env.getProperty("spring.datasource.password")); + return dataSource; + } +} diff --git a/tao-api/src/main/java/com/qihang/tao/config/MyBatisConfig.java b/tao-api/src/main/java/com/qihang/tao/config/MyBatisConfig.java new file mode 100644 index 00000000..4f708ee5 --- /dev/null +++ b/tao-api/src/main/java/com/qihang/tao/config/MyBatisConfig.java @@ -0,0 +1,33 @@ +package com.qihang.tao.config; + +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.SqlSessionTemplate; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import javax.sql.DataSource; + +@Configuration +@MapperScan("com.qihang.tao.mapper") +public class MyBatisConfig { + + @Autowired + private DataSource dataSource; + + @Bean + public SqlSessionFactory sqlSessionFactory() throws Exception { + SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean(); + factoryBean.setDataSource(dataSource); + return factoryBean.getObject(); + } + + @Bean + public SqlSessionTemplate sqlSessionTemplate(SqlSessionFactory sqlSessionFactory) { + return new SqlSessionTemplate(sqlSessionFactory); + } + + +} diff --git a/vue3/index.html b/vue3/index.html index eee0eeed..fe3b705f 100644 --- a/vue3/index.html +++ b/vue3/index.html @@ -6,10 +6,10 @@ - - 启航电商OMS订单处理系统 + + 启航电商OMS系统 diff --git a/vue3/src/settings.ts b/vue3/src/settings.ts index dcbf976f..157dad14 100644 --- a/vue3/src/settings.ts +++ b/vue3/src/settings.ts @@ -1,5 +1,5 @@ const defaultSettings: AppSettings = { - title: "启航电商OMS" + + title: "启航电商OMS系统" + "", version: "v2.8.2", showSettings: true,