🔖 Releasing / Version tags.2.0.1 remove not used code

db/pig.sql

@@ -19,6 +19,7 @@ CREATE DATABASE  `pig` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
 SET NAMES utf8;
 SET FOREIGN_KEY_CHECKS = 0;
 
+USE `pig`;
 -- ----------------------------
 --  Table structure for `sys_dept`
 -- ----------------------------
@@ -185,8 +186,6 @@ CREATE TABLE `sys_role` (
   `role_name` varchar(64) COLLATE utf8mb4_bin NOT NULL,
   `role_code` varchar(64) COLLATE utf8mb4_bin NOT NULL,
   `role_desc` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL,
-  `ds_type` char(1) COLLATE utf8mb4_bin NOT NULL DEFAULT '2' COMMENT '数据权限类型',
-  `ds_scope` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '数据权限范围',
   `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
   `del_flag` char(1) COLLATE utf8mb4_bin DEFAULT '0' COMMENT '删除标识（0-正常,1-删除）',

pig-auth/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>${pig.version}</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<artifactId>pig-auth</artifactId>
@@ -39,13 +39,13 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>${pig.version}</version>
+			<version>2.0.1</version>
 		</dependency>
 		<!--security-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-security</artifactId>
-			<version>${pig.version}</version>
+			<version>2.0.1</version>
 		</dependency>
 		<!--JDBC相关-->
 		<dependency>

pig-common/pig-common-core/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>${pig.version}</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<artifactId>pig-common-core</artifactId>

pig-common/pig-common-core/src/main/resources/banner.txt

 ${AnsiColor.BRIGHT_YELLOW}
 
-          :::::::::       :::::::::::       ::::::::       :::    :::
-         :+:    :+:          :+:          :+:    :+:      :+:    :+:
-        +:+    +:+          +:+          +:+              +:+  +:+
-       +#++:++#+           +#+          :#:               +#++:+
-      +#+                 +#+          +#+   +#+#       +#+  +#+
-     #+#                 #+#          #+#    #+#      #+#    #+#
-    ###             ###########       ########       ###    ###
+                :::::::::       :::::::::::       ::::::::
+               :+:    :+:          :+:          :+:    :+:
+              +:+    +:+          +:+          +:+
+             +#++:++#+           +#+          :#:
+            +#+                 +#+          +#+   +#+#
+           #+#                 #+#          #+#    #+#
+          ###             ###########       ########
 
                        www.pig4cloud.com
 

pig-common/pig-common-log/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>${pig.version}</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<artifactId>pig-common-log</artifactId>
@@ -35,13 +35,13 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>${pig.version}</version>
+			<version>2.0.1</version>
 		</dependency>
 		<!--UPMS接口模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>${pig.version}</version>
+			<version>2.0.1</version>
 		</dependency>
 		<!--安全依赖获取上下文信息-->
 		<dependency>

pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java

@@ -18,6 +18,7 @@ package com.pig4cloud.pig.common.log.event;
 
 import com.pig4cloud.pig.admin.api.entity.SysLog;
 import com.pig4cloud.pig.admin.api.feign.RemoteLogService;
+import com.pig4cloud.pig.common.core.constant.SecurityConstants;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;
@@ -39,6 +40,6 @@ public class SysLogListener {
 	@EventListener(SysLogEvent.class)
 	public void saveSysLog(SysLogEvent event) {
 		SysLog sysLog = (SysLog) event.getSource();
-		remoteLogService.saveLog(sysLog);
+		remoteLogService.saveLog(sysLog, SecurityConstants.FROM_IN);
 	}
 }

pig-common/pig-common-security/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>${pig.version}</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<artifactId>pig-common-security</artifactId>
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>${pig.version}</version>
+			<version>2.0.1</version>
 		</dependency>
 		<!--安全模块-->
 		<dependency>
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>${pig.version}</version>
+			<version>2.0.1</version>
 		</dependency>
 	</dependencies>
 </project>

pig-common/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>${pig.version}</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<artifactId>pig-common</artifactId>

pig-config/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>${pig.version}</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<artifactId>pig-config</artifactId>

pig-config/src/main/resources/banner.txt

 ${AnsiColor.BRIGHT_YELLOW}
 
-          :::::::::       :::::::::::       ::::::::       :::    :::
-         :+:    :+:          :+:          :+:    :+:      :+:    :+:
-        +:+    +:+          +:+          +:+              +:+  +:+
-       +#++:++#+           +#+          :#:               +#++:+
-      +#+                 +#+          +#+   +#+#       +#+  +#+
-     #+#                 #+#          #+#    #+#      #+#    #+#
-    ###             ###########       ########       ###    ###
+                :::::::::       :::::::::::       ::::::::
+               :+:    :+:          :+:          :+:    :+:
+              +:+    +:+          +:+          +:+
+             +#++:++#+           +#+          :#:
+            +#+                 +#+          +#+   +#+#
+           #+#                 #+#          #+#    #+#
+          ###             ###########       ########
 
                        www.pig4cloud.com
 

pig-eureka/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>${pig.version}</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<artifactId>pig-eureka</artifactId>

pig-eureka/src/main/resources/banner.txt

 ${AnsiColor.BRIGHT_YELLOW}
 
-          :::::::::       :::::::::::       ::::::::       :::    :::
-         :+:    :+:          :+:          :+:    :+:      :+:    :+:
-        +:+    +:+          +:+          +:+              +:+  +:+
-       +#++:++#+           +#+          :#:               +#++:+
-      +#+                 +#+          +#+   +#+#       +#+  +#+
-     #+#                 #+#          #+#    #+#      #+#    #+#
-    ###             ###########       ########       ###    ###
+                :::::::::       :::::::::::       ::::::::
+               :+:    :+:          :+:          :+:    :+:
+              +:+    +:+          +:+          +:+
+             +#++:++#+           +#+          :#:
+            +#+                 +#+          +#+   +#+#
+           #+#                 #+#          #+#    #+#
+          ###             ###########       ########
 
                        www.pig4cloud.com
 

pig-gateway/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>${pig.version}</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<artifactId>pig-gateway</artifactId>
@@ -54,7 +54,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>${pig.version}</version>
+			<version>2.0.1</version>
 		</dependency>
 	</dependencies>
 

pig-upms/pig-upms-api/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-upms</artifactId>
-		<version>${pig.version}</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<artifactId>pig-upms-api</artifactId>
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>${pig.version}</version>
+			<version>2.0.1</version>
 		</dependency>
 	</dependencies>
 </project>

pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRole.java

@@ -24,7 +24,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -54,11 +53,6 @@ public class SysRole extends Model<SysRole> {
 	@NotBlank(message = "角色描述 不能为空")
 	private String roleDesc;
 
-	@NotNull(message = "数据权限类型 不能为空")
-	private Integer dsType;
-
-	private String dsScope;
-
 	private LocalDateTime createTime;
 	private LocalDateTime updateTime;
 	/**

pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteLogService.java

@@ -18,11 +18,13 @@ package com.pig4cloud.pig.admin.api.feign;
 
 import com.pig4cloud.pig.admin.api.entity.SysLog;
 import com.pig4cloud.pig.admin.api.feign.factory.RemoteLogServiceFallbackFactory;
+import com.pig4cloud.pig.common.core.constant.SecurityConstants;
 import com.pig4cloud.pig.common.core.constant.ServiceNameConstants;
 import com.pig4cloud.pig.common.core.util.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 /**
  * @author lengleng
@@ -34,8 +36,9 @@ public interface RemoteLogService {
 	 * 保存日志
 	 *
 	 * @param sysLog 日志实体
+	 * @param from   内部调用标志
 	 * @return succes、false
 	 */
 	@PostMapping("/log")
-	R<Boolean> saveLog(@RequestBody SysLog sysLog);
+	R<Boolean> saveLog(@RequestBody SysLog sysLog, @RequestHeader(SecurityConstants.FROM) String from);
 }

pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/fallback/RemoteLogServiceFallbackImpl.java

@@ -36,11 +36,12 @@ public class RemoteLogServiceFallbackImpl implements RemoteLogService {
 	/**
 	 * 保存日志
 	 *
-	 * @param sysLog
-	 * @return R
+	 * @param sysLog 日志实体
+	 * @param from   内部调用标志
+	 * @return succes、false
 	 */
 	@Override
-	public R<Boolean> saveLog(SysLog sysLog) {
+	public R<Boolean> saveLog(SysLog sysLog, String from) {
 		log.error("feign 插入日志失败", cause);
 		return null;
 	}

pig-upms/pig-upms-biz/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-upms</artifactId>
-		<version>${pig.version}</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<artifactId>pig-upms-biz</artifactId>
@@ -34,19 +34,19 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>${pig.version}</version>
+			<version>2.0.1</version>
 		</dependency>
 		<!--安全模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-security</artifactId>
-			<version>${pig.version}</version>
+			<version>2.0.1</version>
 		</dependency>
 		<!--日志处理-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-log</artifactId>
-			<version>${pig.version}</version>
+			<version>2.0.1</version>
 		</dependency>
 		<!--配置中心客户端-->
 		<dependency>

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/LogController.java

@@ -76,7 +76,7 @@ public class LogController {
 	 * @return success/false
 	 */
 	@Inner
-	@PostMapping("/save")
+	@PostMapping
 	public R save(@Valid @RequestBody SysLog sysLog) {
 		return new R<>(sysLogService.save(sysLog));
 	}

pig-upms/pig-upms-biz/src/main/resources/mapper/SysRoleMapper.xml

@@ -24,8 +24,6 @@
 		<result column="role_name" property="roleName"/>
 		<result column="role_code" property="roleCode"/>
 		<result column="role_desc" property="roleDesc"/>
-		<result column="ds_type" property="dsType"/>
-		<result column="ds_scope" property="dsScope"/>
 		<result column="create_time" property="createTime"/>
 		<result column="update_time" property="updateTime"/>
 		<result column="del_flag" property="delFlag"/>

pig-upms/pig-upms-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -147,7 +147,8 @@
 		`user`.update_time AS uupdate_time,
 		`user`.del_flag AS udel_flag,
 		`user`.lock_flag AS lock_flag,
-		`user`.dept_id AS deptId
+		`user`.dept_id AS deptId,
+		d.name AS deptName
 		FROM
 		sys_user AS `user`
 		LEFT JOIN sys_dept AS d ON d.dept_id = `user`.dept_id
@@ -155,9 +156,6 @@
 			<if test="query.username != null and query.username != ''">
 				and `user`.username LIKE CONCAT('%',#{query.username},'%')
 			</if>
-			<if test="query.deptId != null and query.deptId != ''">
-				and `user`.dept_id = #{query.deptId}
-			</if>
 		</where>
 		ORDER BY `user`.create_time DESC
 	</select>

pig-upms/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>${pig.version}</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<artifactId>pig-upms</artifactId>

pig-visual/pig-codegen/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-visual</artifactId>
-		<version>${pig.version}</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<artifactId>pig-codegen</artifactId>
@@ -50,13 +50,13 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>${pig.version}</version>
+			<version>2.0.1</version>
 		</dependency>
 		<!--安全模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-security</artifactId>
-			<version>${pig.version}</version>
+			<version>2.0.1</version>
 		</dependency>
 		<!--代码生成模板引擎-->
 		<dependency>

pig-visual/pig-monitor/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-visual</artifactId>
-		<version>${pig.version}</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<artifactId>pig-monitor</artifactId>

pig-visual/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>${pig.version}</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<artifactId>pig-visual</artifactId>

pom.xml

@@ -21,13 +21,12 @@
 
 	<groupId>com.pig4cloud</groupId>
 	<artifactId>pig</artifactId>
-	<version>${pig.version}</version>
+	<version>2.0.1</version>
 	<name>${project.artifactId}</name>
 	<packaging>pom</packaging>
 	<url>https://www.pig4cloud.com</url>
 
 	<properties>
-		<pig.version>2.0.0</pig.version>
 		<spring-boot.version>2.0.8.RELEASE</spring-boot.version>
 		<spring-cloud.version>Finchley.SR2</spring-cloud.version>
 		<spring-platform.version>Cairo-SR5</spring-platform.version>