From 6f01a484270b3a1fbe3e34bd17d5e3b676f9c626 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 04 十二月 2024 11:28:13 +0800
Subject: [PATCH] 修改
---
src/main/resources/config/application-dev.yml | 21 +---
src/main/java/com/whyc/controller/EasyDarwinController.java | 2
src/main/resources/config/application-dev-mysql.yml | 88 +++++++++++++++++
src/main/java/com/whyc/pojo/PwrdevAcdcdata.java | 2
src/main/java/com/whyc/controller/PowerAcdcDataController.java | 3
pom.xml | 13 ++
src/main/java/com/whyc/pojo/EasyDarwin.java | 2
src/main/java/com/whyc/mapper/EasyDarwinMapper.java | 2
src/main/java/com/whyc/service/PwrdevAcdcdataService.java | 56 +++++-----
src/main/resources/config/application-dev-plus.yml | 99 +++++++++++++++++++
src/main/java/com/whyc/mapper/PwrdevAcdcdataMapper.java | 3
src/main/resources/config/application.yml | 3
src/main/java/com/whyc/service/EasyDarwinService.java | 2
13 files changed, 247 insertions(+), 49 deletions(-)
diff --git a/pom.xml b/pom.xml
index 80d3fd0..910d95d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
<optional>true</optional>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>4.3.0</version>
@@ -42,6 +42,11 @@
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
+ </dependency>-->
+ <!--娣诲姞aop-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<!--highgo鏁版嵁搴撹繛鎺ユ睜 瀹夊叏鐗圴4.5鐗堟湰鍙婁紒涓氱増V6鍏煎-->
<dependency>
@@ -49,7 +54,11 @@
<artifactId>HgdbJdbc</artifactId>
<version>6.2.3</version>
</dependency>
-
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>8.0.11</version>
+ </dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
diff --git a/src/main/java/com/whyc/controller/EasyDarwinController.java b/src/main/java/com/whyc/controller/EasyDarwinController.java
index 9191135..f5f7496 100644
--- a/src/main/java/com/whyc/controller/EasyDarwinController.java
+++ b/src/main/java/com/whyc/controller/EasyDarwinController.java
@@ -1,3 +1,4 @@
+/*
package com.whyc.controller;
import com.whyc.dto.Response;
@@ -26,3 +27,4 @@
return service.getFlowInfo();
}
}
+*/
diff --git a/src/main/java/com/whyc/controller/PowerAcdcDataController.java b/src/main/java/com/whyc/controller/PowerAcdcDataController.java
index bca785f..47d6bfa 100644
--- a/src/main/java/com/whyc/controller/PowerAcdcDataController.java
+++ b/src/main/java/com/whyc/controller/PowerAcdcDataController.java
@@ -1,3 +1,4 @@
+/*
package com.whyc.controller;
import com.whyc.dto.Response;
@@ -25,4 +26,4 @@
Response res=service.getPowerData(powerId);
return res;
}
-}
\ No newline at end of file
+}*/
diff --git a/src/main/java/com/whyc/mapper/EasyDarwinMapper.java b/src/main/java/com/whyc/mapper/EasyDarwinMapper.java
index 9b9e0fe..e7cdf33 100644
--- a/src/main/java/com/whyc/mapper/EasyDarwinMapper.java
+++ b/src/main/java/com/whyc/mapper/EasyDarwinMapper.java
@@ -1,6 +1,8 @@
+/*
package com.whyc.mapper;
import com.whyc.pojo.EasyDarwin;
public interface EasyDarwinMapper extends CustomMapper<EasyDarwin>{
}
+*/
diff --git a/src/main/java/com/whyc/mapper/PwrdevAcdcdataMapper.java b/src/main/java/com/whyc/mapper/PwrdevAcdcdataMapper.java
index cbb6925..c92777a 100644
--- a/src/main/java/com/whyc/mapper/PwrdevAcdcdataMapper.java
+++ b/src/main/java/com/whyc/mapper/PwrdevAcdcdataMapper.java
@@ -1,6 +1,7 @@
package com.whyc.mapper;
+/*
import com.whyc.pojo.PwrdevAcdcdata;
public interface PwrdevAcdcdataMapper extends CustomMapper<PwrdevAcdcdata>{
-}
\ No newline at end of file
+}*/
diff --git a/src/main/java/com/whyc/pojo/EasyDarwin.java b/src/main/java/com/whyc/pojo/EasyDarwin.java
index 8c0377a..80e4175 100644
--- a/src/main/java/com/whyc/pojo/EasyDarwin.java
+++ b/src/main/java/com/whyc/pojo/EasyDarwin.java
@@ -1,3 +1,4 @@
+/*
package com.whyc.pojo;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -19,3 +20,4 @@
private String name;
}
+*/
diff --git a/src/main/java/com/whyc/pojo/PwrdevAcdcdata.java b/src/main/java/com/whyc/pojo/PwrdevAcdcdata.java
index 3a63429..e22f7ab 100644
--- a/src/main/java/com/whyc/pojo/PwrdevAcdcdata.java
+++ b/src/main/java/com/whyc/pojo/PwrdevAcdcdata.java
@@ -1,3 +1,4 @@
+/*
package com.whyc.pojo;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -996,3 +997,4 @@
@TableField("is_acdc_mod20_off")
private Integer isAcdcMod20Off;
}
+*/
diff --git a/src/main/java/com/whyc/service/EasyDarwinService.java b/src/main/java/com/whyc/service/EasyDarwinService.java
index d00c931..307f9f0 100644
--- a/src/main/java/com/whyc/service/EasyDarwinService.java
+++ b/src/main/java/com/whyc/service/EasyDarwinService.java
@@ -1,3 +1,4 @@
+/*
package com.whyc.service;
import com.baomidou.dynamic.datasource.annotation.DS;
@@ -26,3 +27,4 @@
}
+*/
diff --git a/src/main/java/com/whyc/service/PwrdevAcdcdataService.java b/src/main/java/com/whyc/service/PwrdevAcdcdataService.java
index 4f5fbe4..00060ae 100644
--- a/src/main/java/com/whyc/service/PwrdevAcdcdataService.java
+++ b/src/main/java/com/whyc/service/PwrdevAcdcdataService.java
@@ -1,28 +1,28 @@
-package com.whyc.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.whyc.dto.Response;
-import com.whyc.mapper.PwrdevAcdcdataMapper;
-import com.whyc.pojo.PwrdevAcdcdata;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class PwrdevAcdcdataService {
- @Autowired(required = false)
- private PwrdevAcdcdataMapper mapper;
-
- /*鏌ヨ鐢垫簮瀹炴椂鏁版嵁
- * @param 鐢垫簮id 鍏ュ弬
- * @return null
- * @author lxw
- * @date 2024/6/27 15:55
- **/
- public Response getPowerData(int powerId) {
- QueryWrapper wrapper= Wrappers.query();
- wrapper.eq("pinf_id",powerId);
- PwrdevAcdcdata acdcdata=mapper.selectOne(wrapper);
- return new Response().setII(1,acdcdata!=null,acdcdata,"鏌ヨ鐢垫簮瀹炴椂鏁版嵁");
- }
-}
\ No newline at end of file
+//package com.whyc.service;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+//import com.whyc.dto.Response;
+//import com.whyc.mapper.PwrdevAcdcdataMapper;
+//import com.whyc.pojo.PwrdevAcdcdata;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Service;
+//
+//@Service
+//public class PwrdevAcdcdataService {
+// @Autowired(required = false)
+// private PwrdevAcdcdataMapper mapper;
+//
+// /*鏌ヨ鐢垫簮瀹炴椂鏁版嵁
+// * @param 鐢垫簮id 鍏ュ弬
+// * @return null
+// * @author lxw
+// * @date 2024/6/27 15:55
+// **/
+// public Response getPowerData(int powerId) {
+// QueryWrapper wrapper= Wrappers.query();
+// wrapper.eq("pinf_id",powerId);
+// PwrdevAcdcdata acdcdata=mapper.selectOne(wrapper);
+// return new Response().setII(1,acdcdata!=null,acdcdata,"鏌ヨ鐢垫簮瀹炴椂鏁版嵁");
+// }
+//}
\ No newline at end of file
diff --git a/src/main/resources/config/application-dev-mysql.yml b/src/main/resources/config/application-dev-mysql.yml
new file mode 100644
index 0000000..70cdb05
--- /dev/null
+++ b/src/main/resources/config/application-dev-mysql.yml
@@ -0,0 +1,88 @@
+#绯荤粺绫诲瀷:1(鏅��,鏃犻檺鍒�),2(涓ユ牸-gw鏍囧噯),3(涓ユ牸-绛惧悕)
+system:
+ type: 1
+#鏈嶅姟绔彛鍙�
+server:
+ port: 8088
+ serverHeader:
+ servlet:
+ context-path: /br
+ session:
+ cookie:
+ name: br
+ http-only: true
+ tomcat:
+ max-http-form-post-size: 102400000
+http:
+ port: -1
+#鏁版嵁搴�
+spring:
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.10.82:5867/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false
+ username: root
+ password: lmx8688139
+ maxIdel: 60
+ initialPoolSize: 2
+ minPoolSize: 5
+ maxPoolSize: 500
+ servlet:
+ multipart:
+ max-file-size: 200MB
+ max-request-size: 200MB
+mybatis-plus:
+ typeAliasesPackage: com.whyc.pojo,com.whyc.dto
+ mapper-locations: classpath:mapper/**/*Mapper.xml
+ global-config:
+ db-config:
+ #涓婚敭绫诲瀷 0:"鏁版嵁搴揑D鑷", 1:"鐢ㄦ埛杈撳叆ID",2:"鍏ㄥ眬鍞竴ID (鏁板瓧绫诲瀷鍞竴ID)", 3:"鍏ㄥ眬鍞竴ID UUID";
+ id-type: AUTO
+ #椹煎嘲涓嬪垝绾胯浆鎹�
+ table-underline: true
+ #鏁版嵁搴撳ぇ鍐欎笅鍒掔嚎杞崲
+ capital-mode: true
+ #mp2.3+ 鍏ㄥ眬琛ㄥ墠缂� tb_
+ table-prefix: tb_
+ #鍒锋柊mapper 璋冭瘯绁炲櫒
+# refresh-mapper: true
+ configuration:
+ #閰嶇疆杩斿洖鏁版嵁搴�(column涓嬪垝绾垮懡鍚�&&杩斿洖java瀹炰綋鏄┘宄板懡鍚�)锛岃嚜鍔ㄥ尮閰嶆棤闇�as锛堟病寮�鍚繖涓紝SQL闇�瑕佸啓as锛� select user_id as userId锛�
+ map-underscore-to-camel-case: true
+ cache-enabled: false
+ #mybatis鏃ュ織杈撳嚭
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+pagehelper:
+ helper-dialect: mysql
+knife:
+ enable: true
+configFile:
+ type: 1 #1:鏈湴娴嬭瘯锛�2锛氭墦鍖卝ar
+snmp:
+ version: 1
+# address: 10.34.245.2/161
+ address: 192.168.10.80/161
+ community: public
+ retries: 1
+ timeout: 5000
+jasypt:
+ encryptor:
+ password: hELEEWWEEr9Lu6HgEvttjj8vYhy3ID+PqPbumuXhcHhe
+ algorithm: PBEWithMD5AndDES
+ iv-generator-classname: org.jasypt.iv.NoIvGenerator
+custom:
+ #鐧诲綍楠岃瘉鐮� on/off
+ fontDynamicCode: on
+ #鍏佽璺ㄥ煙鐨勭櫧鍚嶅崟 http://192.168.10.132:8080,http://192.168.10.109:8080
+ cors: http://localhost:8080,http://192.168.10.114:8080,http://localhost:5173,http://192.168.10.86:8080
+ #閲嶅惎瀵嗙爜
+ restartPasswd: ENC(AKxTGQo6bAABeC62B8Dtxw==)
+ rsa:
+ #publicKeyOld: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCPpJ3j+SHQ69lqq+ShV7deA40Y+8rYra6rr4ReOJ+UE7ek8tsJJrcy1xMO1SophJdHXXwSNbZWhnJW9GlIq1Um6IplkwFc/AtyoeJDP3EJtUZgI5H6fSz0BPLFHn18C0Nxz1Br109U07DqQdMsarcBmKXYQw+2oZOz0KpA5b0FawIDAQAB
+ #privateKeyOld: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAI+kneP5IdDr2Wqr5KFXt14DjRj7ytitrquvhF44n5QTt6Ty2wkmtzLXEw7VKimEl0ddfBI1tlaGclb0aUirVSboimWTAVz8C3Kh4kM/cQm1RmAjkfp9LPQE8sUefXwLQ3HPUGvXT1TTsOpB0yxqtwGYpdhDD7ahk7PQqkDlvQVrAgMBAAECgYA8ASdX4W2n6a4kKnRSleLqqg8aHazqAPvTinmAJqU65VW02SJ42yxyV3gFnTSErXfIfxviO3/U+0ruWiFVEwV5oDEh0dOd+HHGm4YzFXIRglMeRBgLuVJ+owzoVDwZstiIBa69DIjaJtmpSf5FjwxAth+gtCv3e11IXHraKN720QJBAMPMB1WtmpRGYHxWVYjKSL+RGw+h3gMQLk3exZjhmYRlXuqfVZ2Zol+NazDc59K5f+geMdJ0/X2kKnKLVjWzYHMCQQC7z1cFYswtLemxGfj+dwlVC01VL4pKa7HGHl/FAQ2UNYZY2d5hE/nXYbTpfI0gMowX926/aFpia7NbAUJO7WEpAkAyUFa+LJthaOhYazMVsK2bFKW4kabkcJ8Fga6TR73UaNxIPGOa2SUBmuylpM6ptuNoeYHiDBAr3ijOQIIJ0KuDAkBy9fPahCNe9F+73J4hhVPdDtIDdto7u7hSAX215XMeabUW5iXNXqDsSg6nbWolb0t50CemWoYZALwE1Lx1+7AhAkEAoZtFt+2skjAxHEqNUye4vKBqB2Ng/wmfitCfT34lXWQsxs4BGk/8eQMzkam9bcB7FcinolxHF/1UjsUYpI+AgA==
+ publicKey: ENC(RFwEWQPojWyBu7BO0WwGEum/3YChVJuxg9i9W02gfSYi4V7Po56zRhFFGdIl60lTFxEA7JVgVZ+BTVVFAJcuaNECgVT0IbuzvGk/8GZslhVXciPqwonQmUxGbGQ9HP7wOl+pCkAB9vPa9qYnGrOb8Ie1c9Yz/ogGJzFBHPB5MFmkAKrt/QC55oBCFhj3+8JZYYDdy8HElZzjtp5BtPD60h0DVOLbw94PG8680VZNDv25yhtAZdsXYIpDpUuxAA+kvp0Zl0dXDRw6BHcPh0PP+q65pz56Fgy+8AXnPEP/o8jkaEs7WWFqqspHsi9joapK4rX47qyQX+2gLdjvI5gqcCucIC/lGl0uGusrWc7HbPGkVWewr7wKIv5hLGc2keMijLjGlqBr2PFBGtPeSk+BVxCIHK4kjKQ32bHP6OE4MtIjzg5G3M2fd04/KWDRqWkYq45oiJc2KBggyYCTUD4KkTVwL4OZxaqC7wQFmJbz2tzA2uvh0ejR3lA+lMSqjWarw7GuHK+L1on6ogzGOM5GHkuehkTvbQdCOOAxARg8YRiNd6tgnGwk7G+spLco3yqTbKcEy6Cr/oJ1ay4apiUgoyakA3/Lz0R+Z2zBKVzHp+kRN6R2Y4JzqmhHdbvLm2UrCkL4NA3NBQICbEiFlIccyUV+w48c3ENb+y+hLuzExI4baY4DF3CNYEwpIi8GEX5rwRlhxrr9FNpxkdx0Tkog+SLu4JMS9LDdiQZNimAxvdZqGpJxpoe6v7GVSs8TjEBy)
+ privateKey: ENC(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)
+ aes:
+ defaultKey: ENC(KdXXhvt6v7BDw7MgsR4J1OgahZgjl3kEil10+147oGA=)
+ iv: ENC(Gtzf6s+BRoC1iQsRLMswSlBDSMom0kWtx5+SMJgaVDg=)
+ i18n: zh-CN
diff --git a/src/main/resources/config/application-dev-plus.yml b/src/main/resources/config/application-dev-plus.yml
new file mode 100644
index 0000000..e016358
--- /dev/null
+++ b/src/main/resources/config/application-dev-plus.yml
@@ -0,0 +1,99 @@
+#绯荤粺绫诲瀷:1(鏅��,鏃犻檺鍒�),2(涓ユ牸-gw鏍囧噯),3(涓ユ牸-绛惧悕)
+system:
+ type: 1
+#鏈嶅姟绔彛鍙�
+server:
+ port: 8088
+ serverHeader:
+ servlet:
+ context-path: /br
+ session:
+ cookie:
+ name: br
+ http-only: true
+ tomcat:
+ max-http-form-post-size: 102400000
+http:
+ port: -1
+#鏁版嵁搴�
+spring:
+ datasource:
+ dynamic:
+ primary: master # 榛樿浣跨敤mater搴�
+ strict: false # 涓嶄娇鐢ㄤ弗鏍兼ā寮�
+ datasource:
+ master:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driver-class-name: com.highgo.jdbc.Driver
+ # url: jdbc:dm://localhost:5236/SYSDBA?rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+ url: jdbc:highgo://192.168.10.183:5866/highgo?rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+ username: sysdba
+ password: Lmx&8688139
+ db2:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driver-class-name: org.sqlite.JDBC
+ url: jdbc:sqlite:E:\2杞欢涓嬭浇鍖匼easydarwin\EasyDarwin-windows-8.2.2-24031216\data\db\EasyDarwin.db?date_string_format=yyyy-MM-dd HH:mm:ss
+ # url: jdbc:sqlite:\2杞欢涓嬭浇鍖匼easydarwin\EasyDarwin-windows-8.2.2-24031216\data\db\EasyDarwin.db?date_string_format=yyyy-MM-dd HH:mm:ss
+ maxIdel: 60
+ initialPoolSize: 2
+ minPoolSize: 5
+ maxPoolSize: 500
+ servlet:
+ multipart:
+ max-file-size: 200MB
+ max-request-size: 200MB
+mybatis-plus:
+ typeAliasesPackage: com.whyc.pojo,com.whyc.dto
+ mapper-locations: classpath:mapper/**/*Mapper.xml
+ global-config:
+ db-config:
+ #涓婚敭绫诲瀷 0:"鏁版嵁搴揑D鑷", 1:"鐢ㄦ埛杈撳叆ID",2:"鍏ㄥ眬鍞竴ID (鏁板瓧绫诲瀷鍞竴ID)", 3:"鍏ㄥ眬鍞竴ID UUID";
+ id-type: AUTO
+ #椹煎嘲涓嬪垝绾胯浆鎹�
+ table-underline: true
+ #鏁版嵁搴撳ぇ鍐欎笅鍒掔嚎杞崲
+ capital-mode: true
+ #mp2.3+ 鍏ㄥ眬琛ㄥ墠缂� tb_
+ table-prefix: tb_
+ #鍒锋柊mapper 璋冭瘯绁炲櫒
+# refresh-mapper: true
+ configuration:
+ #閰嶇疆杩斿洖鏁版嵁搴�(column涓嬪垝绾垮懡鍚�&&杩斿洖java瀹炰綋鏄┘宄板懡鍚�)锛岃嚜鍔ㄥ尮閰嶆棤闇�as锛堟病寮�鍚繖涓紝SQL闇�瑕佸啓as锛� select user_id as userId锛�
+ map-underscore-to-camel-case: true
+ cache-enabled: false
+ #mybatis鏃ュ織杈撳嚭
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+pagehelper:
+ helper-dialect: mysql
+knife:
+ enable: true
+configFile:
+ type: 1 #1:鏈湴娴嬭瘯锛�2锛氭墦鍖卝ar
+snmp:
+ version: 1
+# address: 10.34.245.2/161
+ address: 192.168.10.80/161
+ community: public
+ retries: 1
+ timeout: 5000
+jasypt:
+ encryptor:
+ password: hELEEWWEEr9Lu6HgEvttjj8vYhy3ID+PqPbumuXhcHhe
+ algorithm: PBEWithMD5AndDES
+ iv-generator-classname: org.jasypt.iv.NoIvGenerator
+custom:
+ #鐧诲綍楠岃瘉鐮� on/off
+ fontDynamicCode: on
+ #鍏佽璺ㄥ煙鐨勭櫧鍚嶅崟 http://192.168.10.132:8080,http://192.168.10.109:8080
+ cors: http://localhost:8080,http://192.168.10.114:8080,http://localhost:5173,http://192.168.10.86:8080
+ #閲嶅惎瀵嗙爜
+ restartPasswd: ENC(AKxTGQo6bAABeC62B8Dtxw==)
+ rsa:
+ #publicKeyOld: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCPpJ3j+SHQ69lqq+ShV7deA40Y+8rYra6rr4ReOJ+UE7ek8tsJJrcy1xMO1SophJdHXXwSNbZWhnJW9GlIq1Um6IplkwFc/AtyoeJDP3EJtUZgI5H6fSz0BPLFHn18C0Nxz1Br109U07DqQdMsarcBmKXYQw+2oZOz0KpA5b0FawIDAQAB
+ #privateKeyOld: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAI+kneP5IdDr2Wqr5KFXt14DjRj7ytitrquvhF44n5QTt6Ty2wkmtzLXEw7VKimEl0ddfBI1tlaGclb0aUirVSboimWTAVz8C3Kh4kM/cQm1RmAjkfp9LPQE8sUefXwLQ3HPUGvXT1TTsOpB0yxqtwGYpdhDD7ahk7PQqkDlvQVrAgMBAAECgYA8ASdX4W2n6a4kKnRSleLqqg8aHazqAPvTinmAJqU65VW02SJ42yxyV3gFnTSErXfIfxviO3/U+0ruWiFVEwV5oDEh0dOd+HHGm4YzFXIRglMeRBgLuVJ+owzoVDwZstiIBa69DIjaJtmpSf5FjwxAth+gtCv3e11IXHraKN720QJBAMPMB1WtmpRGYHxWVYjKSL+RGw+h3gMQLk3exZjhmYRlXuqfVZ2Zol+NazDc59K5f+geMdJ0/X2kKnKLVjWzYHMCQQC7z1cFYswtLemxGfj+dwlVC01VL4pKa7HGHl/FAQ2UNYZY2d5hE/nXYbTpfI0gMowX926/aFpia7NbAUJO7WEpAkAyUFa+LJthaOhYazMVsK2bFKW4kabkcJ8Fga6TR73UaNxIPGOa2SUBmuylpM6ptuNoeYHiDBAr3ijOQIIJ0KuDAkBy9fPahCNe9F+73J4hhVPdDtIDdto7u7hSAX215XMeabUW5iXNXqDsSg6nbWolb0t50CemWoYZALwE1Lx1+7AhAkEAoZtFt+2skjAxHEqNUye4vKBqB2Ng/wmfitCfT34lXWQsxs4BGk/8eQMzkam9bcB7FcinolxHF/1UjsUYpI+AgA==
+ publicKey: ENC(RFwEWQPojWyBu7BO0WwGEum/3YChVJuxg9i9W02gfSYi4V7Po56zRhFFGdIl60lTFxEA7JVgVZ+BTVVFAJcuaNECgVT0IbuzvGk/8GZslhVXciPqwonQmUxGbGQ9HP7wOl+pCkAB9vPa9qYnGrOb8Ie1c9Yz/ogGJzFBHPB5MFmkAKrt/QC55oBCFhj3+8JZYYDdy8HElZzjtp5BtPD60h0DVOLbw94PG8680VZNDv25yhtAZdsXYIpDpUuxAA+kvp0Zl0dXDRw6BHcPh0PP+q65pz56Fgy+8AXnPEP/o8jkaEs7WWFqqspHsi9joapK4rX47qyQX+2gLdjvI5gqcCucIC/lGl0uGusrWc7HbPGkVWewr7wKIv5hLGc2keMijLjGlqBr2PFBGtPeSk+BVxCIHK4kjKQ32bHP6OE4MtIjzg5G3M2fd04/KWDRqWkYq45oiJc2KBggyYCTUD4KkTVwL4OZxaqC7wQFmJbz2tzA2uvh0ejR3lA+lMSqjWarw7GuHK+L1on6ogzGOM5GHkuehkTvbQdCOOAxARg8YRiNd6tgnGwk7G+spLco3yqTbKcEy6Cr/oJ1ay4apiUgoyakA3/Lz0R+Z2zBKVzHp+kRN6R2Y4JzqmhHdbvLm2UrCkL4NA3NBQICbEiFlIccyUV+w48c3ENb+y+hLuzExI4baY4DF3CNYEwpIi8GEX5rwRlhxrr9FNpxkdx0Tkog+SLu4JMS9LDdiQZNimAxvdZqGpJxpoe6v7GVSs8TjEBy)
+ privateKey: ENC(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)
+ aes:
+ defaultKey: ENC(KdXXhvt6v7BDw7MgsR4J1OgahZgjl3kEil10+147oGA=)
+ iv: ENC(Gtzf6s+BRoC1iQsRLMswSlBDSMom0kWtx5+SMJgaVDg=)
+ i18n: zh-CN
diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml
index e016358..f05f122 100644
--- a/src/main/resources/config/application-dev.yml
+++ b/src/main/resources/config/application-dev.yml
@@ -18,22 +18,11 @@
#鏁版嵁搴�
spring:
datasource:
- dynamic:
- primary: master # 榛樿浣跨敤mater搴�
- strict: false # 涓嶄娇鐢ㄤ弗鏍兼ā寮�
- datasource:
- master:
- type: com.alibaba.druid.pool.DruidDataSource
- driver-class-name: com.highgo.jdbc.Driver
- # url: jdbc:dm://localhost:5236/SYSDBA?rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
- url: jdbc:highgo://192.168.10.183:5866/highgo?rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
- username: sysdba
- password: Lmx&8688139
- db2:
- type: com.alibaba.druid.pool.DruidDataSource
- driver-class-name: org.sqlite.JDBC
- url: jdbc:sqlite:E:\2杞欢涓嬭浇鍖匼easydarwin\EasyDarwin-windows-8.2.2-24031216\data\db\EasyDarwin.db?date_string_format=yyyy-MM-dd HH:mm:ss
- # url: jdbc:sqlite:\2杞欢涓嬭浇鍖匼easydarwin\EasyDarwin-windows-8.2.2-24031216\data\db\EasyDarwin.db?date_string_format=yyyy-MM-dd HH:mm:ss
+ type: com.alibaba.druid.pool.DruidDataSource
+ driver-class-name: com.highgo.jdbc.Driver
+ url: jdbc:highgo://192.168.10.183:5866/highgo?rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+ username: sysdba
+ password: Lmx&8688139
maxIdel: 60
initialPoolSize: 2
minPoolSize: 5
diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml
index b098a98..9cde9ad 100644
--- a/src/main/resources/config/application.yml
+++ b/src/main/resources/config/application.yml
@@ -1,7 +1,8 @@
spring:
profiles:
- active: dev
+# active: dev
# active: prod
+ active: dev-mysql
--
Gitblit v1.9.1