syh пре 4 година
родитељ
комит
1d49f45907
15 измењених фајлова са 167 додато и 84 уклоњено
  1. 8 5
      jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
  2. 22 23
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java
  3. 8 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/DictAspect.java
  4. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
  5. 92 8
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  6. 2 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java
  7. 15 9
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
  8. 2 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDictService.java
  9. 2 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
  10. 4 13
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
  11. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
  12. 4 2
      jeecg-boot-module-system/src/main/resources/application-wps.yml
  13. 1 4
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SysUserMapper.xml
  14. 0 3
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/SendMessageServiceImpl.java
  15. 0 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/entity/ByteDanceCampaign.java

+ 8 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -55,13 +55,14 @@ public class ShiroConfig {
         ShiroFilterFactoryBean shiroFilterFactoryBean = new ShiroFilterFactoryBean();
         shiroFilterFactoryBean.setSecurityManager(securityManager);
         // 拦截器
-        Map<String, String> filterChainDefinitionMap = new LinkedHashMap<String, String>();
+        Map<String, String> filterChainDefinitionMap = new LinkedHashMap<>();
         // 配置不会被拦截的链接 顺序判断
         //登录接口排除
-        filterChainDefinitionMap.put("/sys/mLogin", "anon"); //登录接口排除
+        filterChainDefinitionMap.put("/sys/mLogin", "anon");
         filterChainDefinitionMap.put("/sys/login", "anon");
         filterChainDefinitionMap.put("/sys/wxlogin", "anon");
-        filterChainDefinitionMap.put("/thirdLogin/**", "anon"); //第三方登录
+        //第三方登录
+        filterChainDefinitionMap.put("/thirdLogin/**", "anon");
         //获取加密串
         filterChainDefinitionMap.put("/sys/getEncryptedString", "anon");
         //短信验证码
@@ -121,11 +122,11 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/kuaishou/report", "anon");
         filterChainDefinitionMap.put("/ctop/bindAccount/**", "anon");
         filterChainDefinitionMap.put("/**/*.mp4", "anon");
-//activiti
+        //activiti
         filterChainDefinitionMap.put("/activiti/**", "anon");
         filterChainDefinitionMap.put("/diagram-viewer/**", "anon");
         filterChainDefinitionMap.put("/editor-app/**", "anon");
-//大屏设计器排除
+        //大屏设计器排除
         filterChainDefinitionMap.put("/big/screen/**", "anon");
 
         //性能监控
@@ -161,6 +162,8 @@ public class ShiroConfig {
 
         filterChainDefinitionMap.put("/appium/appiumTask/run/login", "anon");
         filterChainDefinitionMap.put("/zip/download", "anon");
+        //WebSocket
+        filterChainDefinitionMap.put("/websocket/*", "anon");
         //爬虫接口
         filterChainDefinitionMap.put("/graphql/video", "anon");
         filterChainDefinitionMap.put("/ks/web/test", "anon");

+ 22 - 23
jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java

@@ -1,8 +1,9 @@
 package org.jeecg.modules.message.websocket;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArraySet;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.constant.WebsocketConst;
+import org.springframework.stereotype.Component;
 
 import javax.websocket.OnClose;
 import javax.websocket.OnMessage;
@@ -10,13 +11,9 @@ import javax.websocket.OnOpen;
 import javax.websocket.Session;
 import javax.websocket.server.PathParam;
 import javax.websocket.server.ServerEndpoint;
-
-import org.jeecg.common.constant.WebsocketConst;
-import org.springframework.stereotype.Component;
-
-import com.alibaba.fastjson.JSONObject;
-
-import lombok.extern.slf4j.Slf4j;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
  * @Author scott
@@ -27,12 +24,12 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 @ServerEndpoint("/websocket/{userId}") //此注解相当于设置访问URL
 public class WebSocket {
-    
+
     private Session session;
-    
+
     private static CopyOnWriteArraySet<WebSocket> webSockets =new CopyOnWriteArraySet<>();
     private static Map<String,Session> sessionPool = new HashMap<String,Session>();
-    
+
     @OnOpen
     public void onOpen(Session session, @PathParam(value="userId")String userId) {
         try {
@@ -43,7 +40,7 @@ public class WebSocket {
 		} catch (Exception e) {
 		}
     }
-    
+
     @OnClose
     public void onClose() {
         try {
@@ -52,17 +49,19 @@ public class WebSocket {
 		} catch (Exception e) {
 		}
     }
-    
+
     @OnMessage
     public void onMessage(String message) {
         //todo 现在有个定时任务刷,应该去掉
     	log.debug("【websocket消息】收到客户端消息:"+message);
     	JSONObject obj = new JSONObject();
-    	obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_CHECK);//业务类型
-    	obj.put(WebsocketConst.MSG_TXT, "心跳响应");//消息内容
+        //业务类型
+        obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_CHECK);
+        //消息内容
+        obj.put(WebsocketConst.MSG_TXT, "心跳响应");
     	session.getAsyncRemote().sendText(obj.toJSONString());
     }
-    
+
     // 此为广播消息
     public void sendAllMessage(String message) {
     	log.info("【websocket消息】广播消息:"+message);
@@ -76,7 +75,7 @@ public class WebSocket {
             }
         }
     }
-    
+
     // 此为单点消息
     public void sendOneMessage(String userId, String message) {
         Session session = sessionPool.get(userId);
@@ -89,7 +88,7 @@ public class WebSocket {
             }
         }
     }
-    
+
     // 此为单点消息(多人)
     public void sendMoreMessage(String[] userIds, String message) {
     	for(String userId:userIds) {
@@ -103,7 +102,7 @@ public class WebSocket {
                 }
             }
     	}
-        
+
     }
-    
-}
+
+}

+ 8 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/DictAspect.java

@@ -104,7 +104,13 @@ public class DictAspect {
                             String text = field.getAnnotation(Dict.class).dicText();
                             String table = field.getAnnotation(Dict.class).dictTable();
                             String extendsKey = field.getAnnotation(Dict.class).extendsKey();
+                            if(extendsKey.trim().equals("")){
+                                extendsKey = null;
+                            }
                             String extendsValue = field.getAnnotation(Dict.class).extendsValue();
+                            if(extendsValue.trim().equals("")){
+                                extendsValue = null;
+                            }
                             String key = String.valueOf(item.get(field.getName()));
                             //翻译字典值对应的txt
                             String textValue = translateDictValue(code, text, table, key,extendsKey,extendsValue);
@@ -148,9 +154,9 @@ public class DictAspect {
                 continue; //跳过循环
             }
             if (!StringUtils.isEmpty(table)){
-                tmpValue= dictService.queryTableDictTextByKey(table,text,code,k.trim());
+                tmpValue= dictService.queryTableDictTextByKey(table,text,code,k.trim(),extendsKey,extendsValue);
             }else {
-                tmpValue = dictService.queryDictTextByKey(code, k.trim());
+                tmpValue = dictService.queryDictTextByKey(code, k.trim(),extendsKey,extendsValue);
             }
 
             if (tmpValue != null) {

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java

@@ -179,10 +179,10 @@ public class SysDictController {
 	@RequestMapping(value = "/getDictText/{dictCode}/{key}", method = RequestMethod.GET)
 	public Result<String> getDictText(@PathVariable("dictCode") String dictCode, @PathVariable("key") String key) {
 		log.info(" dictCode : "+ dictCode);
-		Result<String> result = new Result<String>();
+		Result<String> result = new Result<>();
 		String text = null;
 		try {
-			text = sysDictService.queryDictTextByKey(dictCode, key);
+			text = sysDictService.queryDictTextByKey(dictCode, key,null,null);
 			 result.setSuccess(true);
 			 result.setResult(text);
 		} catch (Exception e) {

+ 92 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -7,6 +7,7 @@ import cn.com.ctop.common.module.model.SysUserSysDepartModel;
 import cn.com.ctop.common.module.service.ISysRoleExtService;
 import cn.com.ctop.common.module.vo.SysDepartUsersVO;
 import cn.com.ctop.common.module.vo.SysUserRoleVO;
+import cn.com.ctop.common.module.vo.SysUserVo;
 import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -31,6 +32,7 @@ import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.system.entity.*;
+import org.jeecg.modules.system.mapper.UserCompanyMapper;
 import org.jeecg.modules.system.model.DepartIdModel;
 import org.jeecg.modules.system.model.SysUserDepartsVO;
 import org.jeecg.modules.system.service.*;
@@ -91,14 +93,6 @@ public class SysUserController {
 
 	@Autowired
 	private RedisUtil redisUtil;
-    @Autowired
-    private IUserCompanyService userCompanyService;
-    @Autowired
-    private ISysRoleExtService roleService;
-    @Autowired
-    private IProjectMemberService memberService;
-    @Autowired
-    private ISysDepartService departService;
     @Value("${jeecg.path.upload}")
     private String upLoadPath;
     @RequestMapping(value = "/getRoleInfo", method = RequestMethod.GET)
@@ -141,6 +135,96 @@ public class SysUserController {
 		return result;
 	}
 
+    @Autowired
+    private UserCompanyMapper userCompanyMapper;
+
+    @RequestMapping(value = "/getAllUserListByCompany", method = RequestMethod.GET)
+    public Result<List<SysUserVo>> getAllUserListByCompany() {
+        Result<List<SysUserVo>> result = new Result<>();
+        try {
+            LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
+            userCompanyQueryWrapper.eq("user_id", user.getId());
+            userCompanyQueryWrapper.orderByDesc("create_time");
+            userCompanyQueryWrapper.last("limit 1");
+            UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
+            String companyId = userCompany.getCompanyId();
+            List<SysUserVo> userList;
+            if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
+                userList = sysUserService.getAllUser();
+            } else {
+                userList = sysUserService.getUserListByCompany(companyId);
+            }
+
+
+            result.setSuccess(true);
+            result.setResult(userList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.setSuccess(false);
+            result.setMessage("请求失败");
+
+        }
+
+        return result;
+    }
+
+    @RequestMapping(value = "/getAllUserList", method = RequestMethod.GET)
+    public Result<List<SysUserVo>> getAllList() {
+        Result<List<SysUserVo>> result = new Result<>();
+        try {
+            LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
+            userCompanyQueryWrapper.eq("user_id", user.getId());
+            userCompanyQueryWrapper.orderByDesc("create_time");
+            userCompanyQueryWrapper.last("limit 1");
+            UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
+            String companyId = userCompany.getCompanyId();
+            List<SysUserVo> userList;
+            if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
+                userList = sysUserService.getAllUser();
+            } else {
+                userList = sysUserService.getUserListByCompany(companyId);
+            }
+            result.setSuccess(true);
+            result.setResult(userList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.setSuccess(false);
+            result.setMessage("请求失败");
+        }
+        return result;
+    }
+
+    @RequestMapping(value = "/getAllSaleList", method = RequestMethod.GET)
+    public Result<List<SysUserVo>> getSaleList() {
+        Result<List<SysUserVo>> result = new Result<>();
+        try {
+            LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            List<SysUserVo> userList;
+            QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
+            userCompanyQueryWrapper.eq("user_id", user.getId());
+            userCompanyQueryWrapper.orderByDesc("create_time");
+            userCompanyQueryWrapper.last("limit 1");
+            UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
+            String companyId = userCompany.getCompanyId();
+            if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
+                userList = sysUserService.getAllSales();
+            } else {
+                userList = sysUserService.getAllSalesByCompanyId(companyId);
+            }
+
+
+            result.setSuccess(true);
+            result.setResult(userList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.setSuccess(false);
+            result.setMessage("请求失败");
+        }
+        return result;
+    }
+
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
     //@RequiresPermissions("user:add")
 	public Result<SysUser> add(@RequestBody JSONObject jsonObject) {

+ 2 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java

@@ -33,18 +33,14 @@ public interface SysDictMapper extends BaseMapper<SysDict> {
 
 	public List<DictModel> queryDictItemsByCode(@Param("code") String code);
 
-	@Deprecated
 	public List<DictModel> queryTableDictItemsByCode(@Param("table") String table,@Param("text") String text,@Param("code") String code);
 
-	@Deprecated
 	public List<DictModel> queryTableDictItemsByCodeAndFilter(@Param("table") String table,@Param("text") String text,@Param("code") String code,@Param("filterSql") String filterSql);
 
-	public String queryDictTextByKey(@Param("code") String code,@Param("key") String key);
+	public String queryDictTextByKey(@Param("code") String code,@Param("key") String key,@Param("extendsKey") String extendsKey,@Param("extendsValue")String extendsValue);
 
-	@Deprecated
-	public String queryTableDictTextByKey(@Param("table") String table,@Param("text") String text,@Param("code") String code,@Param("key") String key);
+	public String queryTableDictTextByKey(@Param("table") String table,@Param("text") String text,@Param("code") String code,@Param("key") String key,@Param("extendsKey") String extendsKey,@Param("extendsValue")String extendsValue);
 
-	@Deprecated
 	public List<DictModel> queryTableDictByKeys(@Param("table") String table, @Param("text") String text, @Param("code") String code, @Param("keyArray") String[] keyArray);
 
 	/**

+ 15 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml

@@ -8,12 +8,15 @@
 		   where dict_id = (select id from sys_dict where dict_code = #{code})
 		   order by s.sort_order asc
 	</select>
-	
+
 	<!-- 通过字典code获取字典数据 -->
 	<select id="queryDictTextByKey" parameterType="String"  resultType="String">
-		   select s.item_text from sys_dict_item s 
+		   select s.item_text from sys_dict_item s
 		   where s.dict_id = (select id from sys_dict where dict_code = #{code})
 		   and s.item_value = #{key}
+		<if test="extendsKey != null and extendsValue != null">
+			and s.${extendsKey} = #{extendsValue}
+		</if>
 	</select>
 
 
@@ -21,7 +24,7 @@
 	<select id="queryTableDictItemsByCode" parameterType="String"  resultType="org.jeecg.common.system.vo.DictModel">
 		   select ${text} as "text",${code} as "value" from ${table}
 	</select>
-	
+
 	<!--通过查询指定table的 text code 获取字典(指定查询条件)-->
 	<select id="queryTableDictItemsByCodeAndFilter" parameterType="String"  resultType="org.jeecg.common.system.vo.DictModel">
 		   select ${text} as "text",${code} as "value" from ${table}
@@ -29,10 +32,13 @@
 			where ${filterSql}
 		</if>
 	</select>
-	
+
 	<!--通过查询指定table的 text code key 获取字典值-->
 	<select id="queryTableDictTextByKey" parameterType="String" resultType="String">
 		   select ${text} as "text" from ${table} where ${code}= #{key}
+		<if test="extendsKey!=null and extendsValue!=null">
+			and ${extendsKey} = #{extendsValue}
+		</if>
 	</select>
 
 	<!--通过查询指定table的 text code key 获取字典值,包含value-->
@@ -47,27 +53,27 @@
 	<select id="duplicateCheckCountSql" resultType="Long" parameterType="org.jeecg.modules.system.model.DuplicateCheckVo">
 		SELECT COUNT(*) FROM ${tableName} WHERE ${fieldName} = #{fieldVal} and id &lt;&gt; #{dataId}
 	</select>
-	
+
 	<!-- 重复校验 sql语句 -->
 	<select id="duplicateCheckCountSqlNoDataId" resultType="Long" parameterType="org.jeecg.modules.system.model.DuplicateCheckVo">
 		SELECT COUNT(*) FROM ${tableName} WHERE ${fieldName} = #{fieldVal}
 	</select>
-		
+
 	<!-- 查询部门信息 作为字典数据 -->
 	<select id="queryAllDepartBackDictModel" resultType="org.jeecg.common.system.vo.DictModel">
 		select id as "value",depart_name as "text" from sys_depart where del_flag = '0'
 	</select>
-	
+
 		<!-- 查询用户信息 作为字典数据 -->
 	<select id="queryAllUserBackDictModel" resultType="org.jeecg.common.system.vo.DictModel">
 		select username as "value",realname as "text" from sys_user where del_flag = '0'
 	</select>
-	
+
 	<!--通过查询指定table的 text code 获取字典数据,且支持关键字查询 -->
 	<select id="queryTableDictItems" parameterType="String"  resultType="org.jeecg.common.system.vo.DictModel">
 		select ${text} as "text",${code} as "value" from ${table} where ${text} like #{keyword}
 	</select>
-	
+
 	<!-- 根据表名、显示字段名、存储字段名、父ID查询树 -->
 	<select id="queryTreeList" parameterType="Object" resultType="org.jeecg.modules.system.model.TreeSelectModel">
 		select ${text} as "title",

+ 2 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDictService.java

@@ -24,18 +24,14 @@ public interface ISysDictService extends IService<SysDict> {
 
     public Map<String,List<DictModel>> queryAllDictItems();
 
-    @Deprecated
     List<DictModel> queryTableDictItemsByCode(String table, String text, String code);
 
-    @Deprecated
 	public List<DictModel> queryTableDictItemsByCodeAndFilter(String table, String text, String code, String filterSql);
 
-    public String queryDictTextByKey(String code, String key);
+    public String queryDictTextByKey(String code, String key,String extendsKey,String extendsValue);
 
-    @Deprecated
-	String queryTableDictTextByKey(String table, String text, String code, String key);
+	String queryTableDictTextByKey(String table, String text, String code, String key,String extendsKey,String extendsValue);
 
-	@Deprecated
 	List<String> queryTableDictByKeys(String table, String text, String code, String[] keyArray);
 
     /**

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -238,4 +238,6 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @return
 	 */
 	List<SysUser> queryByDepIds(List<String> departIds, String username);
+
+	List<SysUserVo> getAllUser();
 }

+ 4 - 13
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.DictQuery;
@@ -15,7 +14,6 @@ import org.jeecg.modules.system.mapper.SysDictMapper;
 import org.jeecg.modules.system.model.TreeSelectModel;
 import org.jeecg.modules.system.service.ISysDictService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -48,7 +46,6 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	 * @return
 	 */
 	@Override
-	@Cacheable(value = CacheConstant.SYS_DICT_CACHE,key = "#code")
 	public List<DictModel> queryDictItemsByCode(String code) {
 		log.info("无缓存dictCache的时候调用这里!");
 		return sysDictMapper.queryDictItemsByCode(code);
@@ -84,10 +81,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	 */
 
 	@Override
-	@Cacheable(value = CacheConstant.SYS_DICT_CACHE,key = "#code+':'+#key")
-	public String queryDictTextByKey(String code, String key) {
+	public String queryDictTextByKey(String code, String key,String extendsKey,String extendsValue) {
 		log.info("无缓存dictText的时候调用这里!");
-		return sysDictMapper.queryDictTextByKey(code, key);
+		return sysDictMapper.queryDictTextByKey(code, key,extendsKey,extendsValue);
 	}
 
 	/**
@@ -99,9 +95,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	 * @return
 	 */
 	@Override
-	//@Cacheable(value = CacheConstant.SYS_DICT_TABLE_CACHE)
 	public List<DictModel> queryTableDictItemsByCode(String table, String text, String code) {
-		log.info("无缓存dictTableList的时候调用这里!");
 		return sysDictMapper.queryTableDictItemsByCode(table,text,code);
 	}
 
@@ -121,10 +115,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	 * @return
 	 */
 	@Override
-	@Cacheable(value = CacheConstant.SYS_DICT_TABLE_CACHE)
-	public String queryTableDictTextByKey(String table,String text,String code, String key) {
-		log.info("无缓存dictTable的时候调用这里!");
-		return sysDictMapper.queryTableDictTextByKey(table,text,code,key);
+	public String queryTableDictTextByKey(String table,String text,String code, String key,String extendsKey,String extendsValue) {
+		return sysDictMapper.queryTableDictTextByKey(table,text,code,key,extendsKey,extendsValue);
 	}
 
 	/**
@@ -137,7 +129,6 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	 * @return
 	 */
 	@Override
-	@Cacheable(value = CacheConstant.SYS_DICT_TABLE_CACHE)
 	public List<String> queryTableDictByKeys(String table, String text, String code, String[] keyArray) {
 		List<DictModel> dicts = sysDictMapper.queryTableDictByKeys(table, text, code, keyArray);
 		List<String> texts = new ArrayList<>(dicts.size());

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -261,6 +261,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	}
 
 	@Override
+	public List<SysUserVo> getAllUser() {
+		return userMapper.getAllUser();
+	}
+
+	@Override
 	public Map<String, String> getDepNamesByUserIds(List<String> userIds) {
 		List<SysUserDepVo> list = this.baseMapper.getDepNamesByUserIds(userIds);
 		Map<String, String> res = new HashMap<String, String>();

+ 4 - 2
jeecg-boot-module-system/src/main/resources/application-wps.yml

@@ -56,7 +56,8 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+#    url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://39.106.184.70:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
     password: test@20190531
     driver-class-name: com.mysql.jdbc.Driver
@@ -95,7 +96,8 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+#          url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://39.106.184.70:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           password: test@20190531
           driver-class-name: com.mysql.jdbc.Driver

+ 1 - 4
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SysUserMapper.xml

@@ -83,7 +83,6 @@ SELECT
    )
 </select>
 	<select id="getAllUser" resultType="cn.com.ctop.common.module.vo.SysUserVo">
-
       SELECT
       t1.id userId,
       t1.username userName,
@@ -91,9 +90,7 @@ SELECT
       (SELECT role_name FROM sys_role WHERE id = t2.role_id ) roleName
     FROM sys_user t1
     LEFT JOIN sys_user_role t2 on t1.id = t2.user_id;
-
-
-</select>
+	</select>
 	<!-- SQL片段:getUserByOrgCode 的 FROM 和 WHERE 部分 -->
 	<sql id="getUserByOrgCodeFromSql">
 		FROM

+ 0 - 3
module-common/src/main/java/cn/com/ctop/common/module/service/impl/SendMessageServiceImpl.java

@@ -1,7 +1,6 @@
 package cn.com.ctop.common.module.service.impl;
 
 import cn.com.ctop.common.module.mapper.MailLogMapper;
-import cn.com.ctop.common.module.service.ICorpFeishuUserService;
 import cn.com.ctop.common.module.service.ISendMessageService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.CorpWexinUtils;
@@ -14,8 +13,6 @@ import org.springframework.stereotype.Service;
 public class SendMessageServiceImpl implements ISendMessageService {
     @Autowired
     private MailLogMapper mailLogMapper;
-    @Autowired
-    private ICorpFeishuUserService corpFeishuUserService;
     @Override
     public void sendMessage(String userId, String text) {
         String weChatId = mailLogMapper.getWChatIdByUserId(userId);

+ 0 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/entity/ByteDanceCampaign.java

@@ -91,7 +91,6 @@ public class ByteDanceCampaign {
 
     public ByteDanceCampaign(Long id, String advertiserId, Long toutiaoId, String name, BigDecimal budget, String budgetMode, String landingType, String modifyTime, String status, String optStatus, String campaignCreateTime, String campaignModifyTime, Date createTime, Date updateTime) {
         this.id = id;
-
         this.name = name;
         this.budget = budget;
         this.budgetMode = budgetMode;