common-frame/hcframe
17
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

修复组织机构后台更新日期，修复框架更新id问题，修复用户服务redis问题

Browse Source
This commit is contained in:
lhc
2021-03-29 11:23:40 +08:00
parent 8d7e8bceb6
commit ed060c8a62
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hcframe-parent/hcframe-activiti/src/main/java/com/hcframe/activiti/common/ShiroRealmConfig.java
View File

@@ -73,5 +73,4 @@ public class ShiroRealmConfig implements SystemRealm {
map.put("/**", ShiroType.ANON);
return map;
}
}

2
hcframe-parent/hcframe-base/src/main/resources/mapping/data/TableMapper.xml
View File

@@ -117,7 +117,7 @@
where id = #{info.id}
</update>
<update id="updateByWhere" parameterType="map" useGeneratedKeys="true" keyProperty="info.id" keyColumn="id">
<update id="updateByWhere" parameterType="map" useGeneratedKeys="true" keyProperty="info.id">
update ${tableName}
<set>
<foreach collection="info" separator="," item="value" index="key">

3
hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/module/userinfo/service/impl/OrgServiceImpl.java
View File

@@ -39,8 +39,7 @@ public class OrgServiceImpl implements OrgService {
@Override
public ResultVO<Object> addOrg(Map<String, Object> org) {
baseMapper.save(OS_SYS_ORG,ORG_ID,org);
return ResultVO.getSuccess();
return ResultVO.getSuccess(tableService.saveWithDate(TABLE_INFO, org));
}
@Override

8
hcframe-parent/hcframe-user/src/main/resources/application.yml
View File

@@ -28,10 +28,10 @@ spring:
ehcache:
config: classpath:ehcache.xml
redis:
database: 0
host: 192.168.4.119
port: 6379
password:
database: @redis.database@
host: @redis.host@
port: @redis.port@
password: @redis.password@
lettuce:
pool:
# 连接池中的最大空闲连接 默认8

12
hcframe-parent/pom.xml
View File

@@ -143,23 +143,23 @@
<!--当前环境-->
<profile.name>dev</profile.name>
<!--Nacos配置中心地址-->
<config.server-addr>taixingyiji.synology.me:8848</config.server-addr>
<config.server-addr>192.168.100.98:8848</config.server-addr>
<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
<config.namespace>686efed2-0f46-4f3f-9a67-10e858ee1d44</config.namespace>
<config.namespace>2e9f0148-751e-4da2-83ec-cb00ffe0d83a</config.namespace>
<!--Nacos配置分组名称-->
<config.group>DEFAULT_GROUP</config.group>
<config.username>dev</config.username>
<config.password>123456</config.password>
<!-- Nacos服务发现地址-->
<discovery.server-addr>taixingyiji.synology.me:8848</discovery.server-addr>
<discovery.server-addr>192.168.100.98:8848</discovery.server-addr>
<!-- redis 配置-->
<redis.database>0</redis.database>
<redis.host>192.168.4.119</redis.host>
<redis.host>192.168.100.98</redis.host>
<redis.port>6379</redis.port>
<redis.password/>
<!-- cas配置 -->
<cas.client-context-path>/user/cas/valid</cas.client-context-path>
<cas.cas-service-url>http://taixingyiji.synology.me:8081</cas.cas-service-url>
<cas.cas-service-url>http://192.168.100.98:8080</cas.cas-service-url>
<cas.cas-context-path>/cas</cas.cas-context-path>
<cas.white-url>^.*(/logout?)$</cas.white-url>
<cas.service-url>http://localhost:8084</cas.service-url>
@@ -206,7 +206,7 @@
<!--Nacos配置中心地址-->
<config.server-addr>127.0.0.1:8848</config.server-addr>
<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
<config.namespace></config.namespace>
<config.namespace>2e9f0148-751e-4da2-83ec-cb00ffe0d83a</config.namespace>
<!--Nacos配置分组名称-->
<config.group>DEFAULT_GROUP</config.group>
<config.username>dev</config.username>