From 69d0ad32bbb1084f746bc493b77977220ad246df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Mon, 29 Jul 2024 16:59:52 +0800 Subject: [PATCH] 'commit' --- .../spring-configuration-metadata.json | 22 -------- .../target/classes/bootstrap-dev.yml | 13 +++-- .../spring-configuration-metadata.json | 22 -------- .../spring-configuration-metadata.json | 22 -------- Ylt/ms-admin/pom.xml | 5 +- Ylt/ms-distribute/pom.xml | 5 +- Ylt/ms-excel/pom.xml | 5 +- Ylt/ms-finance/pom.xml | 3 +- Ylt/ms-openapi/pom.xml | 5 +- Ylt/ms-order/pom.xml | 5 +- Ylt/ms-protocol-kstar/pom.xml | 5 +- .../spring-configuration-metadata.json | 22 -------- Ylt/ms-protocol-shenghong/pom.xml | 5 +- .../spring-configuration-metadata.json | 22 -------- Ylt/ms-protocol-xingxing/pom.xml | 5 +- .../spring-configuration-metadata.json | 22 -------- Ylt/ms-protocol/pom.xml | 5 +- .../spring-configuration-metadata.json | 22 -------- Ylt/ms-station/pom.xml | 5 +- Ylt/ms-task/pom.xml | 5 +- Ylt/ms-user/pom.xml | 10 +++- .../com/charge/ActiveRecordPluginConfig.java | 56 +++++++++++++++++++ .../src/main/resources/bootstrap-dev.yml | 2 +- Ylt/ms-user/src/test/java/UserTest.java | 12 +++- Ylt/ms-user/target/classes/bootstrap-dev.yml | 36 +++++++----- Ylt/ms-user/target/classes/bootstrap.yml | 3 +- Ylt/ms-wallet/pom.xml | 3 +- Ylt/ms-websocket-ocpp/pom.xml | 3 +- Ylt/rough-dependencies/pom.xml | 4 ++ 29 files changed, 150 insertions(+), 204 deletions(-) delete mode 100644 Ylt/gw-charge/target/classes/META-INF/spring-configuration-metadata.json delete mode 100644 Ylt/gw-openapi/target/classes/META-INF/spring-configuration-metadata.json delete mode 100644 Ylt/gw-saas-mgr/target/classes/META-INF/spring-configuration-metadata.json delete mode 100644 Ylt/ms-protocol-kstar/target/classes/META-INF/spring-configuration-metadata.json delete mode 100644 Ylt/ms-protocol-shenghong/target/classes/META-INF/spring-configuration-metadata.json delete mode 100644 Ylt/ms-protocol-xingxing/target/classes/META-INF/spring-configuration-metadata.json delete mode 100644 Ylt/ms-protocol/target/classes/META-INF/spring-configuration-metadata.json create mode 100644 Ylt/ms-user/src/main/java/com/charge/ActiveRecordPluginConfig.java diff --git a/Ylt/gw-charge/target/classes/META-INF/spring-configuration-metadata.json b/Ylt/gw-charge/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 1169ca6..0000000 --- a/Ylt/gw-charge/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "hints": [], - "groups": [ - { - "sourceType": "com.i100c.charge.gw.filter.ZuulPreFilter", - "name": "jwt.filter", - "type": "com.i100c.charge.gw.filter.ZuulPreFilter" - } - ], - "properties": [ - { - "sourceType": "com.i100c.charge.gw.filter.ZuulPreFilter", - "name": "jwt.filter.no-access-filter", - "type": "java.util.List" - }, - { - "sourceType": "com.i100c.charge.gw.filter.ZuulPreFilter", - "name": "jwt.filter.should-not-filter", - "type": "java.util.List" - } - ] -} \ No newline at end of file diff --git a/Ylt/gw-charge/target/classes/bootstrap-dev.yml b/Ylt/gw-charge/target/classes/bootstrap-dev.yml index 6403d5c..9b0f98c 100644 --- a/Ylt/gw-charge/target/classes/bootstrap-dev.yml +++ b/Ylt/gw-charge/target/classes/bootstrap-dev.yml @@ -107,10 +107,17 @@ zuul: # 基于配置的服务器列表：需要在项目配置文件中通过<服务名称>.ribbon.listOfServers进行设置。 # 如user-service.ribbon.listOfServers=http://127.0.0.1:8082,http://127.0.0.1:8083 +# 用户模块 +# D:\dsWork\YltProject\Ylt\ms-user\src\main\java\com\charge\rpc\web\UserRpcApiController.java +userapi: + ribbon: + #listOfServers: http://i100c.3322.org:32150 + listOfServers: http://127.0.0.1:7022 + # 订单后台模块 orderbkapi: ribbon: - listOfServers: 127.0.0.1:7011 + listOfServers: http://127.0.0.1:7011 #分发模块 distribute: @@ -143,10 +150,6 @@ stationapi: listOfServers: http://i100c.3322.org:30836 -# 用户模块 -userapi: - ribbon: - listOfServers: http://i100c.3322.org:32150 # 通知模块 cheweiapi: diff --git a/Ylt/gw-openapi/target/classes/META-INF/spring-configuration-metadata.json b/Ylt/gw-openapi/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 9b47ecb..0000000 --- a/Ylt/gw-openapi/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "hints": [], - "groups": [ - { - "sourceType": "com.charge.gwopenapi.filter.ZuulPreFilter", - "name": "jwt.filter", - "type": "com.charge.gwopenapi.filter.ZuulPreFilter" - } - ], - "properties": [ - { - "sourceType": "com.charge.gwopenapi.filter.ZuulPreFilter", - "name": "jwt.filter.no-access-filter", - "type": "java.util.List" - }, - { - "sourceType": "com.charge.gwopenapi.filter.ZuulPreFilter", - "name": "jwt.filter.should-not-filter", - "type": "java.util.List" - } - ] -} \ No newline at end of file diff --git a/Ylt/gw-saas-mgr/target/classes/META-INF/spring-configuration-metadata.json b/Ylt/gw-saas-mgr/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 25eff0d..0000000 --- a/Ylt/gw-saas-mgr/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "hints": [], - "groups": [ - { - "sourceType": "com.charge.gwmgr.filter.ZuulPreFilter", - "name": "jwt.filter", - "type": "com.charge.gwmgr.filter.ZuulPreFilter" - } - ], - "properties": [ - { - "sourceType": "com.charge.gwmgr.filter.ZuulPreFilter", - "name": "jwt.filter.no-access-filter", - "type": "java.util.List" - }, - { - "sourceType": "com.charge.gwmgr.filter.ZuulPreFilter", - "name": "jwt.filter.should-not-filter", - "type": "java.util.List" - } - ] -} \ No newline at end of file diff --git a/Ylt/ms-admin/pom.xml b/Ylt/ms-admin/pom.xml index eb9b596..4134fea 100644 --- a/Ylt/ms-admin/pom.xml +++ b/Ylt/ms-admin/pom.xml @@ -62,18 +62,19 @@ com.alibaba druid - 1.0.11 + ${druid.version} mysql mysql-connector-java + 5.1.43 com.alibaba druid-spring-boot-starter - 1.1.0 + ${druid.version} diff --git a/Ylt/ms-distribute/pom.xml b/Ylt/ms-distribute/pom.xml index 35987a5..929a971 100644 --- a/Ylt/ms-distribute/pom.xml +++ b/Ylt/ms-distribute/pom.xml @@ -49,18 +49,19 @@ com.alibaba druid - 1.0.11 + ${druid.version} mysql mysql-connector-java + 5.1.43 com.alibaba druid-spring-boot-starter - 1.1.0 + ${druid.version} diff --git a/Ylt/ms-excel/pom.xml b/Ylt/ms-excel/pom.xml index 3ff01cf..b23b489 100644 --- a/Ylt/ms-excel/pom.xml +++ b/Ylt/ms-excel/pom.xml @@ -55,7 +55,7 @@ com.alibaba druid - 1.0.11 + ${druid.version} @@ -67,12 +67,13 @@ mysql mysql-connector-java + 5.1.43 com.alibaba druid-spring-boot-starter - 1.1.0 + ${druid.version} diff --git a/Ylt/ms-finance/pom.xml b/Ylt/ms-finance/pom.xml index 26a549f..3ac08b0 100644 --- a/Ylt/ms-finance/pom.xml +++ b/Ylt/ms-finance/pom.xml @@ -33,12 +33,13 @@ mysql mysql-connector-java + 5.1.43 com.alibaba druid - 1.0.11 + ${druid.version} diff --git a/Ylt/ms-openapi/pom.xml b/Ylt/ms-openapi/pom.xml index 361124b..c069a20 100644 --- a/Ylt/ms-openapi/pom.xml +++ b/Ylt/ms-openapi/pom.xml @@ -57,6 +57,7 @@ mysql mysql-connector-java + 5.1.43 @@ -151,13 +152,13 @@ com.alibaba druid - 1.0.11 + ${druid.version} com.alibaba druid-spring-boot-starter - 1.1.0 + ${druid.version} diff --git a/Ylt/ms-order/pom.xml b/Ylt/ms-order/pom.xml index d9b89be..5f9ad09 100644 --- a/Ylt/ms-order/pom.xml +++ b/Ylt/ms-order/pom.xml @@ -52,16 +52,17 @@ com.alibaba druid - 1.0.11 + ${druid.version} mysql mysql-connector-java + 5.1.43 com.alibaba druid-spring-boot-starter - 1.1.0 + ${druid.version} diff --git a/Ylt/ms-protocol-kstar/pom.xml b/Ylt/ms-protocol-kstar/pom.xml index 62c0b0b..60b641d 100644 --- a/Ylt/ms-protocol-kstar/pom.xml +++ b/Ylt/ms-protocol-kstar/pom.xml @@ -50,18 +50,19 @@ com.alibaba druid - 1.0.11 + ${druid.version} mysql mysql-connector-java + 5.1.43 com.alibaba druid-spring-boot-starter - 1.1.0 + ${druid.version} diff --git a/Ylt/ms-protocol-kstar/target/classes/META-INF/spring-configuration-metadata.json b/Ylt/ms-protocol-kstar/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 9579ccb..0000000 --- a/Ylt/ms-protocol-kstar/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "hints": [], - "groups": [ - { - "sourceType": "com.charge.kstar.model.ProtocolConfig", - "name": "protocol_servers", - "type": "com.charge.kstar.model.ProtocolConfig" - } - ], - "properties": [ - { - "sourceType": "com.charge.kstar.model.ProtocolConfig", - "name": "protocol_servers.list", - "type": "java.util.List" - }, - { - "sourceType": "com.charge.kstar.model.ProtocolConfig", - "name": "protocol_servers.name", - "type": "java.lang.String" - } - ] -} \ No newline at end of file diff --git a/Ylt/ms-protocol-shenghong/pom.xml b/Ylt/ms-protocol-shenghong/pom.xml index 2f1b3e8..9c9e8ff 100644 --- a/Ylt/ms-protocol-shenghong/pom.xml +++ b/Ylt/ms-protocol-shenghong/pom.xml @@ -50,18 +50,19 @@ com.alibaba druid - 1.0.11 + ${druid.version} mysql mysql-connector-java + 5.1.43 com.alibaba druid-spring-boot-starter - 1.1.0 + ${druid.version} diff --git a/Ylt/ms-protocol-shenghong/target/classes/META-INF/spring-configuration-metadata.json b/Ylt/ms-protocol-shenghong/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index b79fcb2..0000000 --- a/Ylt/ms-protocol-shenghong/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "hints": [], - "groups": [ - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers", - "type": "com.charge.protocol.model.ProtocolConfig" - } - ], - "properties": [ - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers.list", - "type": "java.util.List" - }, - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers.name", - "type": "java.lang.String" - } - ] -} \ No newline at end of file diff --git a/Ylt/ms-protocol-xingxing/pom.xml b/Ylt/ms-protocol-xingxing/pom.xml index 350abcd..7df5168 100644 --- a/Ylt/ms-protocol-xingxing/pom.xml +++ b/Ylt/ms-protocol-xingxing/pom.xml @@ -50,18 +50,19 @@ com.alibaba druid - 1.0.11 + ${druid.version} mysql mysql-connector-java + 5.1.43 com.alibaba druid-spring-boot-starter - 1.1.0 + ${druid.version} diff --git a/Ylt/ms-protocol-xingxing/target/classes/META-INF/spring-configuration-metadata.json b/Ylt/ms-protocol-xingxing/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index b79fcb2..0000000 --- a/Ylt/ms-protocol-xingxing/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "hints": [], - "groups": [ - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers", - "type": "com.charge.protocol.model.ProtocolConfig" - } - ], - "properties": [ - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers.list", - "type": "java.util.List" - }, - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers.name", - "type": "java.lang.String" - } - ] -} \ No newline at end of file diff --git a/Ylt/ms-protocol/pom.xml b/Ylt/ms-protocol/pom.xml index 4235838..ce3afa7 100644 --- a/Ylt/ms-protocol/pom.xml +++ b/Ylt/ms-protocol/pom.xml @@ -53,18 +53,19 @@ com.alibaba druid - 1.0.11 + ${druid.version} mysql mysql-connector-java + 5.1.43 com.alibaba druid-spring-boot-starter - 1.1.0 + ${druid.version} diff --git a/Ylt/ms-protocol/target/classes/META-INF/spring-configuration-metadata.json b/Ylt/ms-protocol/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index b79fcb2..0000000 --- a/Ylt/ms-protocol/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "hints": [], - "groups": [ - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers", - "type": "com.charge.protocol.model.ProtocolConfig" - } - ], - "properties": [ - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers.list", - "type": "java.util.List" - }, - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers.name", - "type": "java.lang.String" - } - ] -} \ No newline at end of file diff --git a/Ylt/ms-station/pom.xml b/Ylt/ms-station/pom.xml index 0a66fb1..e019435 100644 --- a/Ylt/ms-station/pom.xml +++ b/Ylt/ms-station/pom.xml @@ -63,18 +63,19 @@ com.alibaba druid - 1.0.11 + ${druid.version} mysql mysql-connector-java + 5.1.43 com.alibaba druid-spring-boot-starter - 1.1.0 + ${druid.version} diff --git a/Ylt/ms-task/pom.xml b/Ylt/ms-task/pom.xml index 7815397..73a94c1 100644 --- a/Ylt/ms-task/pom.xml +++ b/Ylt/ms-task/pom.xml @@ -48,18 +48,19 @@ com.alibaba druid - 1.0.11 + ${druid.version} mysql mysql-connector-java + 5.1.43 com.alibaba druid-spring-boot-starter - 1.1.0 + ${druid.version} diff --git a/Ylt/ms-user/pom.xml b/Ylt/ms-user/pom.xml index fea41d9..7ca9843 100644 --- a/Ylt/ms-user/pom.xml +++ b/Ylt/ms-user/pom.xml @@ -18,6 +18,13 @@ + + + com.jfinal + jfinal + ${jfinal.version} + + com.aliyun aliyun-java-sdk-core @@ -151,7 +158,7 @@ com.alibaba druid - 1.0.11 + ${druid.version} @@ -223,6 +230,7 @@ mysql mysql-connector-java + 5.1.43 diff --git a/Ylt/ms-user/src/main/java/com/charge/ActiveRecordPluginConfig.java b/Ylt/ms-user/src/main/java/com/charge/ActiveRecordPluginConfig.java new file mode 100644 index 0000000..a7203f7 --- /dev/null +++ b/Ylt/ms-user/src/main/java/com/charge/ActiveRecordPluginConfig.java @@ -0,0 +1,56 @@ +package com.charge; + +import com.alibaba.druid.wall.WallFilter; +import com.jfinal.plugin.activerecord.ActiveRecordPlugin; +import com.jfinal.plugin.activerecord.dialect.MysqlDialect; +import com.jfinal.plugin.druid.DruidPlugin; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.io.File; + +@Configuration +public class ActiveRecordPluginConfig { + //通过SpringBoot获取到数据库配置 + @Value("${spring.datasource.username}") + private String username; + + @Value("${spring.datasource.password}") + private String password; + + @Value("${spring.datasource.url}") + private String url; + + @Value("${spring.datasource.driver-class-name}") + private String driverClassName; + + @Bean + public ActiveRecordPlugin initActiveRecordPlugin() { + DruidPlugin druidPlugin = new DruidPlugin(url, username, password, driverClassName); + + // 加强数据库安全 + WallFilter wallFilter = new WallFilter(); + wallFilter.setDbType("mysql"); + druidPlugin.addFilter(wallFilter); + druidPlugin.start(); + + // 配置ActiveRecord插件 + ActiveRecordPlugin arp = new ActiveRecordPlugin(druidPlugin); + arp.setDialect(new MysqlDialect()); + //遍历sql目录下所有的sql文件 + File sqlDir; + String basePath = ActiveRecordPluginConfig.class.getClassLoader().getResource(".").getPath(); + sqlDir = new File(basePath + "/Sql"); + File[] sqlFiles = sqlDir.listFiles(); + for (File sqlFile : sqlFiles != null ? sqlFiles : new File[0]) { + //只加载.sql文件 + if (sqlFile.getName().indexOf(".sql") > 0) { + arp.addSqlTemplate("/Sql/" + sqlFile.getName()); + } + } + //加载 + arp.start(); + return arp; + } +} \ No newline at end of file diff --git a/Ylt/ms-user/src/main/resources/bootstrap-dev.yml b/Ylt/ms-user/src/main/resources/bootstrap-dev.yml index 6c210e9..853f649 100644 --- a/Ylt/ms-user/src/main/resources/bootstrap-dev.yml +++ b/Ylt/ms-user/src/main/resources/bootstrap-dev.yml @@ -5,7 +5,7 @@ spring: uri: mongodb://ycharge:ycharge@139.224.72.142:27017/ycharge datasource: # mysql数据库 - url: jdbc:mysql://139.224.72.142:3307/yltcharge?useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://139.224.72.142:3307/yltcharge?useUnicode=true&characterEncoding=UTF-8&useSSL=false username: ycharge password: ycharge driver-class-name: com.mysql.jdbc.Driver diff --git a/Ylt/ms-user/src/test/java/UserTest.java b/Ylt/ms-user/src/test/java/UserTest.java index 608564c..a4a5873 100644 --- a/Ylt/ms-user/src/test/java/UserTest.java +++ b/Ylt/ms-user/src/test/java/UserTest.java @@ -1,5 +1,7 @@ import com.charge.UserApplication; import com.charge.rpc.facade.UserFacade; +import com.jfinal.plugin.activerecord.Db; +import com.jfinal.plugin.activerecord.Record; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; @@ -8,7 +10,6 @@ import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; - @RunWith(SpringRunner.class) @SpringBootTest(classes = UserApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class UserTest { @@ -19,8 +20,15 @@ public class UserTest { @Test public void test() { - boolean b = userFacade.judgeChargingStrategy("1008964013559005", 1,15583L); + boolean b = userFacade.judgeChargingStrategy("1008964013559005", 1, 15583L); System.out.println(b); } + @Test + public void getId() { + String sql = "select * from t_car where id=908"; + Record record = Db.findFirst(sql); + System.out.println(record); + } + } diff --git a/Ylt/ms-user/target/classes/bootstrap-dev.yml b/Ylt/ms-user/target/classes/bootstrap-dev.yml index c577c86..853f649 100644 --- a/Ylt/ms-user/target/classes/bootstrap-dev.yml +++ b/Ylt/ms-user/target/classes/bootstrap-dev.yml @@ -1,9 +1,11 @@ spring: data: mongodb: - uri: mongodb://ycharge:ycharge@i100c.3322.org:13002/ycharge + # mongodb数据库 + uri: mongodb://ycharge:ycharge@139.224.72.142:27017/ycharge datasource: - url: jdbc:mysql://139.224.72.142:3307/yltcharge?useUnicode=true&characterEncoding=UTF-8 + # mysql数据库 + url: jdbc:mysql://139.224.72.142:3307/yltcharge?useUnicode=true&characterEncoding=UTF-8&useSSL=false username: ycharge password: ycharge driver-class-name: com.mysql.jdbc.Driver @@ -13,7 +15,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource filters: stat maxActive: 20 - + # Redis redis: database: 0 host: 139.224.72.142 @@ -24,7 +26,7 @@ spring: max-active: 8 max-idle: 8 min-idle: 0 - + # 邮件服务器 mail: host: smtp.sina.com username: i100c_report@sina.com @@ -32,22 +34,23 @@ spring: port: 587 properties: mail: - smtp: - auth: true - starttls: - enable: true - required: true - + smtp: + auth: true + starttls: + enable: true + required: true +# 负载均衡器 ribbon: eureka: - enabled: false + enabled: false # 禁用了eureka，不依赖 eureka ReadTimeout: 60000 ConnectTimeout: 60000 MaxAutoRetries: 0 MaxAutoRetriesNextServer: 1 +# 记录数据库日志 logging: level: com: @@ -60,6 +63,7 @@ logging: properties: config: debug +# 这块没看懂，待完善，此处用户管理是业务模块，它调用了别人吗？ financeapi: ribbon: listOfServers: http://i100c.3322.org:32134 @@ -81,11 +85,13 @@ aliyunvinapi: ribbon: listOfServers: https://vin.shumaidata.com +# 微信 wx: config: - appId: wx9863e002c6a5f8bd - appScrect: ee9f5f214f2054f504544476ae542231 + appId: wx9863e002c6a5f8bd + appScrect: ee9f5f214f2054f504544476ae542231 +# 阿里大鱼的短信服务 aliSms: product: Dysmsapi domain: dysmsapi.aliyuncs.com @@ -97,14 +103,14 @@ aliSms: signName: 快卜新能源 templateCode: SMS_200181031 +# 腾讯OCR tencentOcr: secretId: AKIDBAF4e0p5w4XlmYeBuud6IGzg8dttMIB6 secretKey: zmJZXN1zgIfnfHclhnriIdhpiOsPwDEz region: ap-shanghai endpoint: ocr.tencentcloudapi.com - - +# 阿里云存储 aliyun: oss: imageUrl: http://senergyimage.i100c.com/ diff --git a/Ylt/ms-user/target/classes/bootstrap.yml b/Ylt/ms-user/target/classes/bootstrap.yml index 8373fec..b980812 100644 --- a/Ylt/ms-user/target/classes/bootstrap.yml +++ b/Ylt/ms-user/target/classes/bootstrap.yml @@ -44,13 +44,14 @@ mybatis-plus: map-underscore-to-camel-case: true cache-enabled: false +# 分页插件 pagehelper: helperDialect: mysql reasonable: true supportMethodsArguments: true params: count=countSql - +# 阿里云短信 aliSms: product: Dysmsapi domain: dysmsapi.aliyuncs.com diff --git a/Ylt/ms-wallet/pom.xml b/Ylt/ms-wallet/pom.xml index 5e5c93a..e31b2ea 100644 --- a/Ylt/ms-wallet/pom.xml +++ b/Ylt/ms-wallet/pom.xml @@ -65,7 +65,7 @@ com.alibaba druid - 1.0.11 + ${druid.version} aspectj @@ -157,6 +157,7 @@ mysql mysql-connector-java + 5.1.43 org.springframework.boot diff --git a/Ylt/ms-websocket-ocpp/pom.xml b/Ylt/ms-websocket-ocpp/pom.xml index b2ad319..8467b80 100644 --- a/Ylt/ms-websocket-ocpp/pom.xml +++ b/Ylt/ms-websocket-ocpp/pom.xml @@ -85,7 +85,7 @@ com.alibaba druid - 1.0.11 + ${druid.version} aspectj @@ -177,6 +177,7 @@ mysql mysql-connector-java + 5.1.43 org.springframework.boot diff --git a/Ylt/rough-dependencies/pom.xml b/Ylt/rough-dependencies/pom.xml index d50bfdb..ccd6e52 100644 --- a/Ylt/rough-dependencies/pom.xml +++ b/Ylt/rough-dependencies/pom.xml @@ -33,6 +33,10 @@ 1.5.10.RELEASE 1.5.6.RELEASE + + 5.1.9 + + 1.2.23 yourdomain.com ycharge