diff --git a/buildpackage/pom.xml b/buildpackage/pom.xml index 338977d9..98cdba92 100644 --- a/buildpackage/pom.xml +++ b/buildpackage/pom.xml @@ -35,7 +35,23 @@ - + + + local + + local + + + true + + + + dev + + dev + + + kangarooDataCenter diff --git a/buildpackage/src/main/java/com/hzya/frame/WebappApplication.java b/buildpackage/src/main/java/com/hzya/frame/WebappApplication.java index a1bedb90..16161648 100644 --- a/buildpackage/src/main/java/com/hzya/frame/WebappApplication.java +++ b/buildpackage/src/main/java/com/hzya/frame/WebappApplication.java @@ -1,16 +1,22 @@ package com.hzya.frame; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceCreatorAutoConfiguration; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.druid.DruidDynamicDataSourceConfiguration; +import com.hzya.frame.DataSource.impl.DynamicDataSourceAssistConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Import; import org.springframework.context.annotation.ImportResource; @EnableCaching @ServletComponentScan(basePackages = {"com.hzya.frame"}) @ImportResource(locations = {"classpath:cfgHome/**/spring/spring-*.xml"}) +@Import({DruidDynamicDataSourceConfiguration.class, DynamicDataSourceCreatorAutoConfiguration.class, DynamicDataSourceAssistConfiguration.class}) + @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class}) //@SpringBootApplication(scanBasePackages = {"com.hzya.frame"}) public class WebappApplication { diff --git a/buildpackage/src/main/resources/application-dev.yml b/buildpackage/src/main/resources/application-dev.yml new file mode 100644 index 00000000..3fd2ea6b --- /dev/null +++ b/buildpackage/src/main/resources/application-dev.yml @@ -0,0 +1,7 @@ +#######################dev环境####################### +logging: + #日志级别 指定目录级别 + level: + root: error + file: + path: /Users/apple/Desktop/log/dev \ No newline at end of file diff --git a/buildpackage/src/main/resources/application-local.yml b/buildpackage/src/main/resources/application-local.yml new file mode 100644 index 00000000..3352c7e2 --- /dev/null +++ b/buildpackage/src/main/resources/application-local.yml @@ -0,0 +1,7 @@ +#######################本地环境####################### +logging: + #日志级别 指定目录级别 + level: + root: info + file: + path: /Users/apple/Desktop/log/local \ No newline at end of file diff --git a/buildpackage/src/main/resources/application.properties b/buildpackage/src/main/resources/application.properties deleted file mode 100644 index a84ef232..00000000 --- a/buildpackage/src/main/resources/application.properties +++ /dev/null @@ -1,25 +0,0 @@ -#应用名 -spring.application.name=kangarooDataCenter -#端口 -server.port=9999 -#编码集 -server.tomcat.uri-encoding=utf-8 -#工程访问名称 -server.servlet.context-path=/kangarooDataCenter -#json日期格式化 -spring.jackson.date-format=yyyy-MM-dd HH:mm:ss -spring.jackson.time-zone=GMT+8 -context.initializer.classes= com.hzya.frame.web.init.ApplicationContextInitialized -spring.batch.job.enabled = false -mybatis.mapper-locations = classpath*:com/hzya/**/*.xml -mybatis.config-location= classpath:mybatis/mybatis-config.xml -#mybatis.configuration.call-setters-on-nulls=true - -#日志配置 -logging.config= classpath:log/logback-spring.xml -logging.file.path = /Users/xiangerlin/work/app/logs/zhongtai - -#文件最大大小 -spring.servlet.multipart.enabled=true -spring.servlet.multipart.max-file-size=100MB -spring.servlet.multipart.max-request-size=100MB \ No newline at end of file diff --git a/buildpackage/src/main/resources/application.yml b/buildpackage/src/main/resources/application.yml new file mode 100644 index 00000000..e3aaa888 --- /dev/null +++ b/buildpackage/src/main/resources/application.yml @@ -0,0 +1,74 @@ +server: + port: 9999 + servlet: + context-path: /kangarooDataCenter + localIP: 127.0.0.1 + tomcat: + uri-encoding: utf-8 +spring: + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + name: kangarooDataCenter + # mvc: + # pathmatch: + # use-suffix-pattern: true + profiles: + # active: @profileActive@ + active: @profile.active@ + # active: dev + servlet: + multipart: + enabled: true + #单个文件的大小 + max-file-size: 100MB + #单次请求的文件的总大小 + max-request-size: 100MB + # 默认数据源设置 + datasource: + dynamic: + primary: master #设置默认的数据源或者数据源组,默认值即为master + strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 + datasource: + master: + url: jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true + username: root + password: bd993088e8a7c3dc5f44441617f9b4bf +# password: hzya1314 + driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 + druid: + initial-size: 10 # 初始化时建立物理连接的个数。初始化发生在显示调用init方法，或者第一次getConnection时 + min-idle: 10 # 最小连接池数量 + maxActive: 200 # 最大连接池数量 + maxWait: 60000 # 获取连接时最大等待时间，单位毫秒。配置了maxWait之后，缺省启用公平锁，并发效率会有所下降，如果需要可以通过配置 + timeBetweenEvictionRunsMillis: 60000 # 关闭空闲连接的检测时间间隔.Destroy线程会检测连接的间隔时间，如果连接空闲时间大于等于minEvictableIdleTimeMillis则关闭物理连接。 + minEvictableIdleTimeMillis: 300000 # 连接的最小生存时间.连接保持空闲而不被驱逐的最小时间 + validationQuery: SELECT 1 FROM DUAL # 验证数据库服务可用性的sql.用来检测连接是否有效的sql 因数据库方言而差, 例如 oracle 应该写成 SELECT 1 FROM DUAL + testWhileIdle: true # 申请连接时检测空闲时间，根据空闲时间再检测连接是否有效.建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRun + testOnBorrow: false # 申请连接时直接检测连接是否有效.申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 + testOnReturn: false # 归还连接时检测连接是否有效.归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 + poolPreparedStatements: true # 开启PSCache + maxPoolPreparedStatementPerConnectionSize: 20 #设置PSCache值 + connectionErrorRetryAttempts: 3 # 连接出错后再尝试连接三次 + breakAfterAcquireFailure: true # 数据库服务宕机自动重连机制 + timeBetweenConnectErrorMillis: 300000 # 连接出错后重试时间间隔 + asyncInit: true # 异步初始化策略 + remove-abandoned: true # 是否自动回收超时连接 + remove-abandoned-timeout: 1800 # 超时时间(以秒数为单位) + transaction-query-timeout: 6000 # 事务超时时间 + filters: stat,wall,log4j2 + useGlobalDataSourceStat: true #合并多个DruidDataSource的监控数据 + connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 #通过connectProperties属性来打开mergeSql功能；慢SQL记录 + batch: + job: + enabled: false +logging: + #日志配置路径 + # config: classpath:log/logback-spring.xml + config: classpath:logback-spring.xml + file: + path: /Users/apple/Desktop/log/dev +mybatis: + mapper-locations: classpath*:com/hzya/**/*.xml + config-location: classpath:mybatis/mybatis-config.xml \ No newline at end of file diff --git a/buildpackage/src/main/resources/log/logback-spring.xml b/buildpackage/src/main/resources/log/logback-spring.xml index 3dd69b42..8995c8da 100644 --- a/buildpackage/src/main/resources/log/logback-spring.xml +++ b/buildpackage/src/main/resources/log/logback-spring.xml @@ -16,7 +16,7 @@ - + diff --git a/buildpackage/src/main/resources/logback-spring.xml b/buildpackage/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..fdcb1536 --- /dev/null +++ b/buildpackage/src/main/resources/logback-spring.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + INFO + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + ${LOG_HOME}/%d{yyyy-MM-dd}/kangarooDataCenter_%d{yyyy-MM}.log + + 50 + + + + %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n + + + + 50MB + + + + + + + + + + \ No newline at end of file diff --git a/buildpackage/src/test/java/com/hzya/frame/temButtom.java b/buildpackage/src/test/java/com/hzya/frame/temButtom.java index 998d393e..1527601d 100644 --- a/buildpackage/src/test/java/com/hzya/frame/temButtom.java +++ b/buildpackage/src/test/java/com/hzya/frame/temButtom.java @@ -1,5 +1,7 @@ package com.hzya.frame; +import com.hzya.frame.util.AESUtil; +import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; @@ -14,6 +16,12 @@ import org.springframework.test.context.junit4.SpringRunner; @SpringBootTest(classes = {WebappApplication.class}) public class temButtom { + @Test + public void test01() { + String a = AESUtil.encrypt("hzya1314"); + System.out.println(a); + } + } diff --git a/common/src/main/java/com/hzya/frame/basedao/dao/MybatisGenericDao.java b/common/src/main/java/com/hzya/frame/basedao/dao/MybatisGenericDao.java index 3326056d..c578b60e 100644 --- a/common/src/main/java/com/hzya/frame/basedao/dao/MybatisGenericDao.java +++ b/common/src/main/java/com/hzya/frame/basedao/dao/MybatisGenericDao.java @@ -151,7 +151,7 @@ public abstract class MybatisGenericDao myContextThreadLocal = new ThreadLocal<>(); diff --git a/core/src/main/java/com/hzya/frame/DataSource/impl/DataSourceInitEvent.java b/core/src/main/java/com/hzya/frame/DataSource/impl/DataSourceInitEvent.java new file mode 100755 index 00000000..2372c39f --- /dev/null +++ b/core/src/main/java/com/hzya/frame/DataSource/impl/DataSourceInitEvent.java @@ -0,0 +1,45 @@ +/* + * Copyright © 2018 organization baomidou + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hzya.frame.DataSource.impl; + + + +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; + +import javax.sql.DataSource; + +/** + * 多数据源连接池创建事件 + * + * @author TaoYu + * @since 3.5.0 + */ +public interface DataSourceInitEvent { + + /** + * 连接池创建前执行（可用于参数解密） + * + * @param dataSourceProperty 数据源基础信息 + */ + void beforeCreate(DataSourceProperty dataSourceProperty); + + /** + * 连接池创建后执行 + * + * @param dataSource 连接池 + */ + void afterCreate(DataSource dataSource); +} \ No newline at end of file diff --git a/core/src/main/java/com/hzya/frame/DataSource/impl/DynamicDataSourceAssistConfiguration.java b/core/src/main/java/com/hzya/frame/DataSource/impl/DynamicDataSourceAssistConfiguration.java new file mode 100755 index 00000000..2f5fdba9 --- /dev/null +++ b/core/src/main/java/com/hzya/frame/DataSource/impl/DynamicDataSourceAssistConfiguration.java @@ -0,0 +1,47 @@ +/* + * Copyright © 2018 organization baomidou + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hzya.frame.DataSource.impl; + +import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; +import com.baomidou.dynamic.datasource.event.DataSourceInitEvent; +import com.baomidou.dynamic.datasource.provider.DynamicDataSourceProvider; +import com.baomidou.dynamic.datasource.strategy.DynamicDataSourceStrategy; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 动态数据源核心自动配置类 + * + * @author TaoYu Kanyuxia + * @see DynamicDataSourceProvider + * @see DynamicDataSourceStrategy + * @see DynamicRoutingDataSource + * @since 1.0.0 + */ +@Configuration +@RequiredArgsConstructor +public class DynamicDataSourceAssistConfiguration { + + @Bean + @ConditionalOnMissingBean + public DataSourceInitEvent dataSourceInitEvent() { + return new EncDataSourceInitEvent(); + } + + +} \ No newline at end of file diff --git a/core/src/main/java/com/hzya/frame/DataSource/impl/EncDataSourceInitEvent.java b/core/src/main/java/com/hzya/frame/DataSource/impl/EncDataSourceInitEvent.java new file mode 100755 index 00000000..10cc93c3 --- /dev/null +++ b/core/src/main/java/com/hzya/frame/DataSource/impl/EncDataSourceInitEvent.java @@ -0,0 +1,50 @@ +/* + * Copyright © 2018 organization baomidou + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hzya.frame.DataSource.impl; + +import com.baomidou.dynamic.datasource.event.DataSourceInitEvent; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; +import com.hzya.frame.util.AESUtil; +import lombok.extern.slf4j.Slf4j; + +import javax.sql.DataSource; + +/** + * 多数据源默认解密事件 + * + * @author TaoYu + */ +@Slf4j +public class EncDataSourceInitEvent implements DataSourceInitEvent { + + /** + * @Author lvleigang + * @Description 数据源初始化解密，目前只解密密码 + * @Date 11:00 上午 2024/4/11 + * @param dataSourceProperty + * @return void + **/ + @Override + public void beforeCreate(DataSourceProperty dataSourceProperty) { + dataSourceProperty.setPassword(AESUtil.decrypt(dataSourceProperty.getPassword())); + } + + @Override + public void afterCreate(DataSource dataSource) { + + } + +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index b2e27511..1a1f6e6d 100644 --- a/pom.xml +++ b/pom.xml @@ -373,22 +373,30 @@ src/main/resources + **/*.yml **/*.properties **/*.xml **/*.xmreport **/*.xlsx **/*.json **/*.xdb + + **/*.txt + true src/ + **/*.yml **/*.properties **/*.xml **/*.json + **/*.txt + + true diff --git a/service/src/main/java/com/hzya/frame/sys/dataSource/dao/ISysDataSourceDao.java b/service/src/main/java/com/hzya/frame/sys/dataSource/dao/ISysDataSourceDao.java index 070c68f0..acfcaf47 100644 --- a/service/src/main/java/com/hzya/frame/sys/dataSource/dao/ISysDataSourceDao.java +++ b/service/src/main/java/com/hzya/frame/sys/dataSource/dao/ISysDataSourceDao.java @@ -18,5 +18,7 @@ public interface ISysDataSourceDao extends IBaseDao int queryVoList_COUNT(SysDataSourceEntity entity); Integer entity_count_not_id(SysDataSourceEntity checkEntity); + + List queryDSBase(SysDataSourceEntity entity); } diff --git a/service/src/main/java/com/hzya/frame/sys/dataSource/dao/impl/SysDataSourceDaoImpl.java b/service/src/main/java/com/hzya/frame/sys/dataSource/dao/impl/SysDataSourceDaoImpl.java index 52e3ebed..4bcc0c5a 100644 --- a/service/src/main/java/com/hzya/frame/sys/dataSource/dao/impl/SysDataSourceDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/sys/dataSource/dao/impl/SysDataSourceDaoImpl.java @@ -38,5 +38,12 @@ public class SysDataSourceDaoImpl extends MybatisGenericDao queryDSBase(SysDataSourceEntity entity) { + List o = (List) super.selectList(getSqlIdPrifx() + "queryDSBase", entity); + return o; + } } diff --git a/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceEntity.xml b/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceEntity.xml index ab2a0d57..221c88e0 100644 --- a/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceEntity.xml +++ b/service/src/main/java/com/hzya/frame/sys/dataSource/entity/SysDataSourceEntity.xml @@ -214,6 +214,43 @@ order by sorts asc order by ${sort} ${order} + diff --git a/service/src/main/java/com/hzya/frame/sysnew/popedomInterface/service/impl/InterfaceCache.java b/service/src/main/java/com/hzya/frame/sysnew/popedomInterface/service/impl/InterfaceCache.java index 93276e3d..914a656c 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/popedomInterface/service/impl/InterfaceCache.java +++ b/service/src/main/java/com/hzya/frame/sysnew/popedomInterface/service/impl/InterfaceCache.java @@ -190,7 +190,7 @@ public class InterfaceCache { List sysInterfaceEntities = sysInterfaceDao.queryBase(sysInterfaceEntity); if(sysInterfaceEntities != null && sysInterfaceEntities.size() > 0){ for (int i = 0; i < sysInterfaceEntities.size(); i++) { - interfaceMap.put("beanName"+sysInterfaceEntities.get(i).getBeanName()+"interfacName"+sysInterfaceEntities.get(i).getInterfacName(), sysInterfaceEntities.get(i)); + interfaceMap.put("beanName"+sysInterfaceEntities.get(i).getBeanName()+"interfacName"+sysInterfaceEntities.get(i).getInterfaceName(), sysInterfaceEntities.get(i)); } } break; diff --git a/service/src/main/java/com/hzya/frame/sysnew/sysInterface/entity/SysInterfaceEntity.java b/service/src/main/java/com/hzya/frame/sysnew/sysInterface/entity/SysInterfaceEntity.java index 13f4608e..ed508d96 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/sysInterface/entity/SysInterfaceEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/sysInterface/entity/SysInterfaceEntity.java @@ -23,7 +23,7 @@ public class SysInterfaceEntity extends BaseEntity { /** * 方法名 */ - private String interfacName; + private String interfaceName; /** * 备注 */ @@ -58,12 +58,12 @@ public class SysInterfaceEntity extends BaseEntity { this.beanName = beanName; } - public String getInterfacName() { - return interfacName; + public String getInterfaceName() { + return interfaceName; } - public void setInterfacName(String interfacName) { - this.interfacName = interfacName; + public void setInterfaceName(String interfaceName) { + this.interfaceName = interfaceName; } public String getRemark() { diff --git a/service/src/main/java/com/hzya/frame/sysnew/sysInterface/entity/SysInterfaceEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/sysInterface/entity/SysInterfaceEntity.xml index 2aac597c..9c3af38e 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/sysInterface/entity/SysInterfaceEntity.xml +++ b/service/src/main/java/com/hzya/frame/sysnew/sysInterface/entity/SysInterfaceEntity.xml @@ -6,7 +6,7 @@ - + @@ -23,7 +23,7 @@ id ,name ,bean_name - ,interfac_name + ,interface_name ,remark ,state ,sorts @@ -45,7 +45,7 @@ and id = #{id} and name = #{name} and bean_name = #{beanName} - and interfac_name = #{interfacName} + and interface_name = #{interfaceName} and remark = #{remark} and state = #{state} and sorts = #{sorts} @@ -69,7 +69,7 @@ and id = #{id} and name = #{name} and bean_name = #{beanName} - and interfac_name = #{interfacName} + and interface_name = #{interfaceName} and remark = #{remark} and state = #{state} and sorts = #{sorts} @@ -96,8 +96,8 @@ and id like concat('%',#{id},'%') and name like concat('%',#{name},'%') and bean_name like concat('%',#{beanName},'%') - and interfac_name like - concat('%',#{interfacName},'%') + and interface_name like + concat('%',#{interfaceName},'%') and remark like concat('%',#{remark},'%') and state like concat('%',#{state},'%') @@ -129,7 +129,7 @@ or id = #{id} or name = #{name} or bean_name = #{beanName} - or interfac_name = #{interfacName} + or interface_name = #{interfaceName} or remark = #{remark} or state = #{state} or sorts = #{sorts} @@ -154,7 +154,7 @@ id , name , bean_name , - interfac_name , + interface_name , remark , state , sorts , @@ -173,7 +173,7 @@ #{id} , #{name} , #{beanName} , - #{interfacName} , + #{interfaceName} , #{remark} , #{state} , #{sorts} , @@ -193,26 +193,26 @@ - insert into sys_interface(name, bean_name, interfac_name, remark, state, create_user_id, create_time, + insert into sys_interface(name, bean_name, interface_name, remark, state, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts) values - (#{entity.name},#{entity.beanName},#{entity.interfacName},#{entity.remark},#{entity.state},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, + (#{entity.name},#{entity.beanName},#{entity.interfaceName},#{entity.remark},#{entity.state},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y') - insert into sys_interface(name, bean_name, interfac_name, remark, state, create_user_id, create_time, + insert into sys_interface(name, bean_name, interface_name, remark, state, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id) values - (#{entity.name},#{entity.beanName},#{entity.interfacName},#{entity.remark},#{entity.state},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) + (#{entity.name},#{entity.beanName},#{entity.interfaceName},#{entity.remark},#{entity.state},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}) on duplicate key update name = values(name), bean_name = values(bean_name), - interfac_name = values(interfac_name), + interface_name = values(interface_name), remark = values(remark), state = values(state), create_user_id = values(create_user_id), @@ -229,7 +229,7 @@ name = #{name}, bean_name = #{beanName}, - interfac_name = #{interfacName}, + interface_name = #{interfaceName}, remark = #{remark}, state = #{state}, create_user_id = #{create_user_id}, @@ -255,7 +255,7 @@ where id = #{id} and id = #{id} and name = #{name} and bean_name = #{beanName} - and interfac_name = #{interfacName} + and interface_name = #{interfaceName} and remark = #{remark} and state = #{state} and sorts = #{sorts} diff --git a/service/src/main/java/com/hzya/frame/sysnew/sysInterface/service/impl/SysInterfaceServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/sysInterface/service/impl/SysInterfaceServiceImpl.java index eb0c44d4..d19d20d1 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/sysInterface/service/impl/SysInterfaceServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/sysnew/sysInterface/service/impl/SysInterfaceServiceImpl.java @@ -98,7 +98,7 @@ public class SysInterfaceServiceImpl extends BaseService 0){ return false; } @@ -172,7 +172,7 @@ public class SysInterfaceServiceImpl extends BaseService sysDataSourceEntities = sysDataSourceDao.queryVoList(entity); + List sysDataSourceEntities = sysDataSourceDao.queryDSBase(entity); logger.info("beforeDynamicRoutingDataSourceInitMethod:根据dsValue获取数据源信息查询结果 sysDataSourceEntities.size:" + sysDataSourceEntities.size()); if (sysDataSourceEntities != null && sysDataSourceEntities.size() > 0) { for (int i = 0; i < sysDataSourceEntities.size(); i++) { @@ -77,14 +77,13 @@ public class AopDynamicRoutingDataSourceInit { defaultDataSourceProperties.put("source_url", sysDataSourceEntities.get(i).getSourceUrl()); defaultDataSourceProperties.put("source_type", sysDataSourceEntities.get(i).getSourceTypeName()); defaultDataSourceProperties.put("login_name", sysDataSourceEntities.get(i).getLoginName()); - defaultDataSourceProperties.put("password", sysDataSourceEntities.get(i).getPassword()); + defaultDataSourceProperties.put("password", AESUtil.decrypt(sysDataSourceEntities.get(i).getPassword())); + //defaultDataSourceProperties.put("password", sysDataSourceEntities.get(i).getPassword()); defaultDataSourceProperties.put("db_name", sysDataSourceEntities.get(i).getDbName()); try { logger.info("***初始化数据源-{}：*********", sysDataSourceEntities.get(i).getSourceName()); DruidDataSource dataSource = createDefaultDataSource(defaultDataSourceProperties); ds.addDataSource(sysDataSourceEntities.get(i).getSourceCode(), dataSource); - //把datasource放入缓存中 -// DataSourceUtil.createSqlSessionFactoryToCache(sysDataSourceEntities.get(i).getSourceCode(),dataSource); logger.info("***初始化数据源-{}成功：*********", sysDataSourceEntities.get(i).getSourceName()); } catch (Exception e) { logger.info("***初始化数据源-{}失败：*********", sysDataSourceEntities.get(i).getSourceName()); diff --git a/webapp/src/main/java/com/hzya/frame/webapp/web/listener/InitCommandLineRunner.java b/webapp/src/main/java/com/hzya/frame/webapp/web/listener/InitCommandLineRunner.java index 0e85bee7..1d747412 100644 --- a/webapp/src/main/java/com/hzya/frame/webapp/web/listener/InitCommandLineRunner.java +++ b/webapp/src/main/java/com/hzya/frame/webapp/web/listener/InitCommandLineRunner.java @@ -32,7 +32,6 @@ import java.util.List; */ @Component -@Order(999) public class InitCommandLineRunner implements ApplicationListener { Logger logger = LoggerFactory.getLogger(InitCommandLineRunner.class);