jiangjiazhi / center

Download as
Browse Code »

Commit 554a118466426abc85da1e9eed9767e12ebfa269

Authored by fangcheng
1 parent 1765708962
Exists in master

配置文件修改

Showing 6 changed files with 17 additions and 23 deletions

parent/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java View file @ 554a118
... ... @@ -87,6 +87,7 @@
87 87 this.initPwd(user);
88 88  
89 89 Integer tag = userMapper.insert(user);
  90 +
90 91 if(StrUtils.isNotEmpty(user.getDataOrgIds())){
91 92 String[] dataPermissionArray = user.getDataOrgIds().split(",");
92 93 if (dataPermissionArray != null && dataPermissionArray.length > 0) {
parent/center.manager/src/main/java/com/lyms/cm/job/SyncTableJob.java View file @ 554a118
1 1 package com.lyms.cm.job;
2 2  
3   -import java.io.Serializable;
4 3 import java.util.List;
5   -import java.util.concurrent.atomic.AtomicBoolean;
6 4  
7 5 import org.slf4j.Logger;
8 6 import org.slf4j.LoggerFactory;
9 7 import org.springframework.beans.factory.annotation.Autowired;
10   -import org.springframework.data.redis.core.RedisTemplate;
11 8  
12   -import com.alibaba.druid.support.json.JSONUtils;
13 9 import com.alibaba.fastjson.JSONObject;
14 10 import com.baomidou.mybatisplus.mapper.EntityWrapper;
15 11 import com.lyms.base.common.entity.sys.SyncDataBasic;
16 12 import com.lyms.base.common.service.sys.SyncDataBasicService;
17 13 import com.lyms.sync.ParamsAdpter;
18   -import com.lyms.sync.SyncCallback;
19   -import com.lyms.sync.SyncCenter;
20 14 import com.lyms.sync.SyncHandler;
21   -import com.lyms.sync.SyncCenter.Work;
22 15 import com.lyms.sync.channel.ChannelData;
23   -import com.lyms.sync.queue.SyncQueue;
24   -import com.lyms.util.HttpUtils;
25 16 import com.lyms.util.JsonUtils;
26 17  
27 18 /**
... ... @@ -40,8 +31,8 @@
40 31  
41 32 public void excute() {
42 33 List<SyncDataBasic> dataList = syncDataBasicService.selectList(new EntityWrapper<SyncDataBasic>().where("IFSUC=0"));
43   - if(dataList != null ){
44   - log.debug("=======开始进行 SYNC_DATA_BASIC 表格数据的同步=======");
  34 + if(dataList != null && dataList.size() > 0){
  35 + log.debug("=======开始进行本地 SYNC_DATA_BASIC 表格数据的同步=======");
45 36 for(SyncDataBasic entity : dataList){
46 37 try{
47 38 ChannelData data = JsonUtils.jsonToBean(entity.getData(), ChannelData.class);
... ... @@ -54,7 +45,7 @@
54 45 entity.setIfsuc(1);
55 46 syncDataBasicService.updateById(entity);
56 47 }catch (Exception e) {
57   - log.error("【SYNC_DATA_BASIC】表格数据的同步错误：SyncDataBasic = {} {}",JSONObject.toJSON(entity),e);
  48 + log.error("本地【SYNC_DATA_BASIC】表格数据的同步错误：SyncDataBasic = {} {}",JSONObject.toJSON(entity),e);
58 49 }
59 50 }
60 51 }
parent/center.manager/src/main/resources/logback.xml View file @ 554a118
... ... @@ -30,9 +30,11 @@
30 30 <!-- 下面配置一些第三方包的日志过滤级别，用于避免刷屏 -->
31 31 <!-- 打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF 默认是DEBUG -->
32 32 <logger name="org.springframework" level="WARN"/>
33   - <logger name="org.apache" level="DEBUG"/>
34   - <logger name="org.mybatis.spring" level="DEBUG"/>
35   - <logger name="org.apache.ibatis" level="DEBUG"/>
  33 + <logger name="com.baomidou" level="INFO"/>
  34 + <logger name="org.apache" level="INFO"/>
  35 + <logger name="org.mybatis.spring" level="INFO"/>
  36 + <logger name="org.apache.ibatis" level="INFO"/>
  37 + <logger name="org.hibernate.validator" level="INFO"/>
36 38 <logger name="org.quartz" level="INFO"/>
37 39 <logger name="net.sf.ehcache" level="WARN"/>
38 40 <logger name="org.apache.shiro" level="WARN"/>
... ... @@ -44,7 +46,6 @@
44 46 <logger name="org.apache.velocity" level="WARN"/>
45 47 <logger name="org.apache.velocity.tools.view" level="ERROR"/>
46 48  
47   -
48   -
  49 + <logger name="com.lyms.base.common.dao.sys.SyncDataBasicMapper.selectList" level="INFO"/>
49 50 </configuration>
parent/core.sdk/src/main/java/com/lyms/aop/SysLogAop.java View file @ 554a118
... ... @@ -20,8 +20,8 @@
20 20  
21 21 import com.alibaba.fastjson.JSON;
22 22  
23   -@Aspect
24   -@Component
  23 +//@Aspect
  24 +//@Component
25 25 public class SysLogAop {
26 26 private static Logger logger = LoggerFactory.getLogger(SysLogAop.class);
27 27  
parent/core.sdk/src/main/java/com/lyms/util/remote/HttpRemote.java View file @ 554a118
... ... @@ -3,6 +3,7 @@
3 3 import java.io.IOException;
4 4 import java.util.Map;
5 5  
  6 +import org.apache.commons.lang3.builder.ToStringBuilder;
6 7 import org.apache.http.HttpEntity;
7 8 import org.apache.http.client.ClientProtocolException;
8 9 import org.apache.http.client.methods.CloseableHttpResponse;
... ... @@ -46,7 +47,7 @@
46 47 httpContext.getCookieStore().clear();
47 48 return responseUTF8(entity);
48 49 } catch (Exception e) {
49   - LOG.error("连接错误: " + e);
  50 + LOG.error("连接错误: " + e + " ChannelData: 【{}】",ToStringBuilder.reflectionToString(data));
50 51 } finally {
51 52 try {
52 53 if (response != null) {
parent/hospital.web/src/main/resources/logback.xml View file @ 554a118
... ... @@ -30,21 +30,21 @@
30 30 <!-- 下面配置一些第三方包的日志过滤级别，用于避免刷屏 -->
31 31 <!-- 打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF 默认是DEBUG -->
32 32 <logger name="org.springframework" level="INFO"/>
  33 + <logger name="com.baomidou" level="INFO"/>
33 34 <logger name="org.apache" level="INFO"/>
34 35 <logger name="org.mybatis.spring" level="INFO"/>
35 36 <logger name="org.apache.ibatis" level="INFO"/>
36 37 <logger name="org.quartz" level="INFO"/>
  38 + <logger name="org.hibernate.validator" level="INFO"/>
37 39 <logger name="net.sf.ehcache" level="WARN"/>
38 40 <logger name="org.apache.shiro" level="WARN"/>
39 41 <logger name="com.alibaba.druid.pool" level="WARN"/>
40 42 <logger name="org.quartz.core" level="WARN"/>
41 43 <logger name="org.springframework.scheduling.quartz" level="WARN"/>
42 44 <logger name="org.apache.commons" level="WARN"/>
43   -
44 45 <logger name="org.apache.velocity" level="WARN"/>
45 46 <logger name="org.apache.velocity.tools.view" level="ERROR"/>
46 47  
47   -
48   -
  48 + <logger name="com.lyms.base.common.dao.sys.SyncDataBasicMapper.selectList" level="INFO"/>
49 49 </configuration>