Merge remote-tracking branch 'origin/master'

src/main/java/com/lq/cms/service/impl/SysLogServiceImpl.java

@@ -3,7 +3,6 @@ package com.lq.cms.service.impl;
 import com.lq.cms.service.SysLogService;
 import com.lq.cms.vo.SysLogVo;
 import com.lq.code.dao.BaseDao;
-import com.lq.code.service.impl.BaseServiceImpl;
 import com.lq.dao.SysLogDao;
 import com.lq.entity.SysLog;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/lq/cms/service/impl/SysPermissionServiceImpl.java

@@ -4,13 +4,11 @@ import com.lq.cms.emun.StatusTypeEnum;
 import com.lq.cms.service.SysPermissionService;
 import com.lq.cms.vo.SysPermissionVo;
 import com.lq.code.dao.BaseDao;
-import com.lq.code.service.impl.BaseServiceImpl;
 import com.lq.code.util.BeanUtil;
 import com.lq.dao.SysPermissionDao;
 import com.lq.dao.SysResourceDao;
 import com.lq.dao.SysUserDao;
 import com.lq.entity.SysPermission;
-import com.lq.entity.SysResource;
 import com.lq.entity.SysUser;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
@@ -19,7 +17,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * @Author: qi

src/main/java/com/lq/cms/service/impl/SysRoleResourcePermissionServiceImpl.java

@@ -10,7 +10,6 @@ import com.lq.cms.service.SysRoleResourcePermissionService;
 import com.lq.cms.vo.PermissionVo;
 import com.lq.cms.vo.SysRoleResourcePermissionVo;
 import com.lq.code.dao.BaseDao;
-import com.lq.code.service.impl.BaseServiceImpl;
 import com.lq.dao.SysPermissionDao;
 import com.lq.dao.SysResourceDao;
 import com.lq.dao.SysRoleResourcePermissionDao;

src/main/java/com/lq/cms/service/impl/SysRoleServiceImpl.java

@@ -5,7 +5,6 @@ import com.lq.cms.service.SysRoleService;
 import com.lq.cms.vo.SysRoleVo;
 import com.lq.cms.vo.SysUserRoleVo;
 import com.lq.code.dao.BaseDao;
-import com.lq.code.service.impl.BaseServiceImpl;
 import com.lq.dao.SysRoleDao;
 import com.lq.dao.SysRoleResourcePermissionDao;
 import com.lq.dao.SysUserRoleDao;

src/main/java/com/lq/cms/service/impl/SysUserServiceImpl.java

@@ -3,7 +3,6 @@ package com.lq.cms.service.impl;
 import com.lq.cms.service.SysUserService;
 import com.lq.cms.vo.SysUserVo;
 import com.lq.code.dao.BaseDao;
-import com.lq.code.service.impl.BaseServiceImpl;
 import com.lq.code.util.Md5Util;
 import com.lq.dao.SysUserDao;
 import com.lq.dao.SysUserRoleDao;

src/main/java/com/lq/cms/service/impl/WechatInfoServiceImpl.java

@@ -3,7 +3,6 @@ package com.lq.cms.service.impl;
 import com.lq.cms.service.WechatInfoService;
 import com.lq.cms.vo.WechatInfoVo;
 import com.lq.code.dao.BaseDao;
-import com.lq.code.service.impl.BaseServiceImpl;
 import com.lq.dao.WechatInfoDao;
 import com.lq.entity.WechatInfo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +12,7 @@ import java.util.List;
 
 /**
  * Created by qi_liang on 2018/6/21.
+ * @author qi
  */
 @Service
 public class WechatInfoServiceImpl implements WechatInfoService {

src/main/java/com/lq/code/executor/processor/InstantiationTracingBeanPostProcessor.java

@@ -10,6 +10,8 @@ import com.lq.code.util.sql.factory.impl.DefaultDbBuilerFactory;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -45,6 +47,8 @@ public class InstantiationTracingBeanPostProcessor implements ApplicationListene
             //需要执行的逻辑代码，当spring容器初始化完成后就会执行该方法。
             //扫描实体类
             if (isUpdateDB) {
+                List<String> packageList = Arrays.asList(packagePath.split(","));
+
                 Set<Class> set = BeanUtil.getClassSet(packagePath);
            //     QueueDto<Class> queueDto = BeanUtil.getQueueDto(packagePath);
                 DbBuilerFactory dbBuilerFactory = new DefaultDbBuilerFactory();

src/main/java/com/lq/code/util/HttpUtil.java

@@ -17,7 +17,7 @@ public class HttpUtil {
         BufferedReader in=null;
         try {
             String urlNameString=url+"?"+param;
-            URL reaulUrl=new URL("http://www.baidu.com");
+            URL reaulUrl=new URL(urlNameString);
             URLConnection connection=reaulUrl.openConnection();
             // 设置通用的请求属性
 

src/main/java/com/lq/code/util/HttpsClient.java

@@ -128,7 +128,7 @@ public class HttpsClient {
 	
 	private static HttpPost getMultipartPost(String url,String boundarStr) {  
 	    /* 这里设置一些post的头部信息，具体求百度吧 */  
-	    HttpPost post = new HttpPost(url);  
+	    HttpPost post = new HttpPost(url);
 	    post.addHeader("Connection", "keep-alive");  
 	    post.addHeader("Accept", "*/*");  
 	    post.addHeader("Content-Type", "multipart/form-data;boundary="  

src/main/java/com/lq/entity/SysFile.java

@@ -7,6 +7,7 @@ import java.util.Date;
 /**
  * 系统文件
  * Created by qi_liang on 2018/3/25.
+ * @author qi
  */
 public class SysFile extends IdEntity {
     /**

src/main/java/com/lq/entity/SysPermission.java

@@ -6,6 +6,7 @@ import java.util.Date;
 
 /** 权限表
  * Created by qi on 2017-11-29.
+ * @author qi
  */
 public class SysPermission extends IdEntity{
 

src/main/java/com/lq/entity/SysResource.java

@@ -6,6 +6,7 @@ import java.util.Date;
 
 /** 资源表
  * Created by qi on 2017-11-29.
+ * @author qi
  */
 public class SysResource extends IdEntity {
 

src/main/java/com/lq/entity/SysRole.java

@@ -6,6 +6,7 @@ import java.util.Date;
 
 /** 角色表
  * Created by qi on 2017-11-29.
+ * @author qi
  */
 public class SysRole extends IdEntity {
 

src/main/java/com/lq/entity/SysRoleResourcePermission.java

@@ -6,6 +6,7 @@ import java.util.Date;
 
 /** 权限角色资源关联表
  * Created by qi on 2017-11-29.
+ * @author qi
  */
 public class SysRoleResourcePermission extends IdEntity {
 

src/main/java/com/lq/entity/SysUser.java

@@ -6,6 +6,7 @@ import java.util.Date;
 
 /** 用户表
  * Created by qi on 2017-11-29.
+ * @author qi
  */
 public class SysUser extends IdEntity {
 

src/main/java/com/lq/entity/SysUserRole.java

@@ -6,6 +6,7 @@ import java.util.Date;
 
 /** 用户角色表
  * Created by qi on 2017-11-29.
+ * @author qi
  */
 public class SysUserRole extends IdEntity {
 

src/main/java/com/lq/entity/WechatAccessToken.java

@@ -7,6 +7,7 @@ import java.util.Date;
 /**
  * 微信公众号-获取accessToken
  * Created by qi_liang on 2018/5/24.
+ * @author qi
  */
 public class WechatAccessToken extends IdEntity{
     /**

src/main/java/com/lq/entity/WechatInfo.java

@@ -7,6 +7,7 @@ import java.util.Date;
 /**
  *  微信公众号配置
  * Created by qi_liang on 2018/5/24.
+ * @author qi
  */
 public class WechatInfo extends IdEntity {
 

src/main/java/com/lq/entity/WechatInfoSetting.java

@@ -4,6 +4,7 @@ import com.lq.code.entity.IdEntity;
 
 /**
  *  微信公众号设置表
+ * @author qi
  */
 public class WechatInfoSetting extends IdEntity {
 

src/main/java/com/lq/entity/WechatKeyword.java

@@ -7,6 +7,7 @@ import java.util.Date;
 /**
  *  微信公众号-规则-关键字
  *  设计理念：微信公众号规则表与关键字表是一对多的关系。这张表等同于规则表的扩展字段，因此该表会直接和规则表发生关联(@Link wechatRuleId)
+ * @author qi
  */
 public class WechatKeyword extends IdEntity {
     /**

src/main/java/com/lq/entity/WechatMessage.java

@@ -12,6 +12,7 @@ import java.util.Date;
  *          坏处：
  *            1.在此可能衍生的问题可能是无意的修改导致其他公众号的消息也改变。
  *              有牵一发而动全身的风险。
+ * @author qi
  */
 public class WechatMessage extends IdEntity{
     /**

src/main/java/com/lq/entity/WechatUser.java

@@ -7,6 +7,7 @@ import java.util.Date;
 /**
  * 微信公众号用户
  * Created by qi_liang on 2018/5/24.
+ * @author qi
  */
 public class WechatUser extends IdEntity{
     /**