fix:修复jar以及依赖问题

sl
1 parent dfc7ee22
Showing 23 changed files with 124 additions and 52 deletions
itcast-auth/itcast-auth-api/pom.xml
itcast-auth/itcast-auth-entity/pom.xml
itcast-auth/itcast-auth-entity/src/main/java/com/itheima/authority/dto/core/OrgUserTreeDTO.java
itcast-auth/itcast-auth-entity/src/main/java/com/itheima/authority/entity/core/Org.java
itcast-auth/itcast-auth-server/pom.xml
itcast-auth/itcast-auth-server/src/main/java/com/itheima/authority/biz/service/auth/impl/AuthManager.java
itcast-auth/itcast-auth-server/src/main/java/com/itheima/authority/config/datasource/AuthorityDatabaseAutoConfiguration.java
itcast-auth/pom.xml
itcast-gateway/pom.xml
lib/itcast-auth-entity-1.0.8-SNAPSHOT.jar
lib/itcast-tools-common-2.1.9.jar
lib/itcast-tools-core-2.1.9.jar
lib/itcast-tools-databases-2.1.9.jar
lib/itcast-tools-dozer-2.1.9.jar
lib/itcast-tools-j2cache-2.1.9.jar
lib/itcast-tools-jwt-2.1.9.jar
lib/itcast-tools-log-2.1.9.jar
lib/itcast-tools-swagger2-2.1.9.jar
lib/itcast-tools-user-2.1.9.jar
lib/itcast-tools-validator-2.1.9.jar
@@ -62,18 +62,18 @@
         </dependency>
     </dependencies>
-    <distributionManagement>
-        <repository>
-            <id>nexus-release</id>
-            <name>Nexus release Repository</name>
-            <url>http://repo.itheima.net/repository/maven-releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>nexus-snapshots</id>
-            <name>Nexus snapshots Repository</name>
-            <url>http://repo.itheima.net/repository/maven-snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
+<!--    <distributionManagement>-->
+<!--        <repository>-->
+<!--            <id>nexus-release</id>-->
+<!--            <name>Nexus release Repository</name>-->
+<!--            <url>http://repo.itheima.net/repository/maven-releases/</url>-->
+<!--        </repository>-->
+<!--        <snapshotRepository>-->
+<!--            <id>nexus-snapshots</id>-->
+<!--            <name>Nexus snapshots Repository</name>-->
+<!--            <url>http://repo.itheima.net/repository/maven-snapshots/</url>-->
+<!--        </snapshotRepository>-->
+<!--    </distributionManagement>-->
     <build>
         <plugins>
@@ -6,7 +6,7 @@
         <artifactId>itcast-auth</artifactId>
         <groupId>com.itheima</groupId>
         <version>1.0.0</version>
-        <relativePath>../</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -26,7 +26,18 @@
             <groupId>com.itheima</groupId>
             <artifactId>itcast-tools-jwt</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.itheima</groupId>
+            <artifactId>itcast-tools-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.itheima</groupId>
+            <artifactId>itcast-tools-swagger2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.itheima</groupId>
+            <artifactId>itcast-tools-validator</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus</artifactId>
@@ -43,22 +54,34 @@
         <dependency>
             <groupId>com.itheima</groupId>
             <artifactId>itcast-tools-databases</artifactId>
-            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.22</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
     </dependencies>
-    <distributionManagement>
-        <repository>
-            <id>nexus-release</id>
-            <name>Nexus release Repository</name>
-            <url>http://repo.itheima.net/repository/maven-releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>nexus-snapshots</id>
-            <name>Nexus snapshots Repository</name>
-            <url>http://repo.itheima.net/repository/maven-snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
+<!--    <distributionManagement>-->
+<!--        <repository>-->
+<!--            <id>nexus-release</id>-->
+<!--            <name>Nexus release Repository</name>-->
+<!--            <url>http://repo.itheima.net/repository/maven-releases/</url>-->
+<!--        </repository>-->
+<!--        <snapshotRepository>-->
+<!--            <id>nexus-snapshots</id>-->
+<!--            <name>Nexus snapshots Repository</name>-->
+<!--            <url>http://repo.itheima.net/repository/maven-snapshots/</url>-->
+<!--        </snapshotRepository>-->
+<!--    </distributionManagement>-->
 </project>
 package com.itheima.authority.dto.core;
+import cn.hutool.core.collection.CollectionUtil;
 import com.itheima.tools.model.ITreeNode;
 import io.swagger.annotations.ApiModel;
 import lombok.Builder;
 import lombok.Data;
 import lombok.ToString;
-import org.springframework.util.CollectionUtils;
 import java.util.List;
@@ -25,7 +25,7 @@ public class OrgUserTreeDTO implements ITreeNode&lt;OrgUserTreeDTO, Long&gt; {
     private Integer type;
     public Boolean getEnable() {
-        if (type == 1 && CollectionUtils.isEmpty(children)) {
+        if (type == 1 && CollectionUtil.isEmpty(children)) {
             return false;
         }
         return true;
@@ -4,7 +4,6 @@ import java.time.LocalDateTime;
 import javax.validation.constraints.NotEmpty;
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.itheima.tools.base.entity.Entity;
@@ -12,7 +11,6 @@ import com.itheima.tools.base.entity.Entity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -6,7 +6,7 @@
         <groupId>com.itheima</groupId>
         <artifactId>itcast-auth</artifactId>
         <version>1.0.0</version>
-        <relativePath>../</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -81,7 +81,10 @@
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.itheima</groupId>
+            <artifactId>itcast-tools-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.itheima</groupId>
             <artifactId>itcast-tools-j2cache</artifactId>
@@ -99,6 +102,17 @@
             <artifactId>itcast-tools-xss</artifactId>
         </dependency>
         <dependency>
+            <groupId>net.oschina.j2cache</groupId>
+            <artifactId>j2cache-core</artifactId>
+            <scope>system</scope>
+            <systemPath>${lib.path}/lib/j2cache-core-2.4.1-release.jar</systemPath>
+            <version>2.4.1-release</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
             <exclusions>
@@ -171,6 +185,16 @@
             <artifactId>easypoi-spring-boot-starter</artifactId>
             <version>4.1.3</version>
         </dependency>
+        <dependency>
+            <groupId>eu.bitwalker</groupId>
+            <artifactId>UserAgentUtils</artifactId>
+            <version>1.21</version>
+        </dependency>
+        <dependency>
+            <groupId>p6spy</groupId>
+            <artifactId>p6spy</artifactId>
+            <version>3.9.1</version>
+        </dependency>
     </dependencies>
     <build>
@@ -98,7 +98,7 @@ public class AuthManager {
      * @return
      */
     private Token getToken(User user) {
-        JwtUserInfo userInfo = new JwtUserInfo(user.getId(), user.getAccount(), user.getName(), user.getOrgId(), user.getStationId());
+        JwtUserInfo userInfo = new JwtUserInfo(user.getId(), user.getAccount(), user.getName(), user.getOrgId(), user.getStationId(),null,false);
         Token token = this.jwtTokenServerUtils.generateUserToken(userInfo, null);
         log.info("token={}", token.getToken());
@@ -6,18 +6,10 @@ import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
 import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusPropertiesCustomizer;
-import com.baomidou.mybatisplus.core.parser.ISqlParser;
-import com.baomidou.mybatisplus.extension.parsers.BlockAttackSqlParser;
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler;
-import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser;
 import com.itheima.tools.database.datasource.BaseDatabaseConfiguration;
 import com.itheima.tools.database.properties.DatabaseProperties;
 import com.p6spy.engine.spy.P6DataSource;
 import lombok.extern.slf4j.Slf4j;
-import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.expression.LongValue;
-import net.sf.jsqlparser.expression.NullValue;
 import org.apache.ibatis.mapping.DatabaseIdProvider;
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.scripting.LanguageDriver;
@@ -15,6 +15,7 @@
     <description>传智权限管家-权限服务</description>
     <packaging>pom</packaging>
     <modules>
+        <module>itcast-auth-api</module>
         <module>itcast-auth-entity</module>
         <module>itcast-auth-server</module>
     </modules>
@@ -21,6 +21,10 @@
         </dependency>
         <dependency>
             <groupId>com.itheima</groupId>
+            <artifactId>itcast-tools-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.itheima</groupId>
             <artifactId>itcast-tools-log</artifactId>
             <exclusions>
                 <exclusion>
@@ -46,6 +50,7 @@
         <dependency>
             <groupId>com.itheima</groupId>
             <artifactId>itcast-auth-api</artifactId>
+            <version>1.0.1</version>
         </dependency>
         <dependency>
@@ -91,6 +96,13 @@
             <artifactId>knife4j-spring-ui</artifactId>
             <version>2.0.3</version>
         </dependency>
+        <dependency>
+            <groupId>net.oschina.j2cache</groupId>
+            <artifactId>j2cache-core</artifactId>
+            <scope>system</scope>
+            <systemPath>${lib.path}/lib/j2cache-core-2.4.1-release.jar</systemPath>
+            <version>2.4.1-release</version>
+        </dependency>
     </dependencies>
     <build>
@@ -69,7 +69,7 @@
     <properties>
         <itcast-api.version>LATEST</itcast-api.version>
-        <itcast-tools.version>LATEST</itcast-tools.version>
+        <itcast-tools.version>2.1.9</itcast-tools.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -96,6 +96,7 @@
         <guava.version>20.0</guava.version>
         <hutool.version>5.1.0</hutool.version>
         <easy-captcha.version>1.6.2</easy-captcha.version>
+        <lib.path>D:/code/itcast-authority</lib.path>
     </properties>
     <dependencyManagement>
@@ -125,68 +126,89 @@
             <dependency>
                 <groupId>com.itheima</groupId>
                 <artifactId>itcast-auth-entity</artifactId>
-                <version>${itcast-tools.version}</version>
+                <version>1.0.0</version>
             </dependency>
             <dependency>
                 <groupId>com.itheima</groupId>
                 <artifactId>itcast-auth-api</artifactId>
                 <version>${itcast-api.version}</version>
             </dependency>
-
             <!-- itcast-tools -->
             <dependency>
                 <groupId>com.itheima</groupId>
                 <artifactId>itcast-tools-common</artifactId>
+                <systemPath>${lib.path}/lib/itcast-tools-common-2.1.9.jar</systemPath>
+                <scope>system</scope>
                 <version>${itcast-tools.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.itheima</groupId>
                 <artifactId>itcast-tools-j2cache</artifactId>
+                <systemPath>${lib.path}/lib/itcast-tools-j2cache-2.1.9.jar</systemPath>
+                <scope>system</scope>
                 <version>${itcast-tools.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.itheima</groupId>
                 <artifactId>itcast-tools-user</artifactId>
+                <systemPath>${lib.path}/lib/itcast-tools-user-2.1.9.jar</systemPath>
+                <scope>system</scope>
                 <version>${itcast-tools.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.itheima</groupId>
                 <artifactId>itcast-tools-core</artifactId>
+                <systemPath>${lib.path}/lib/itcast-tools-core-2.1.9.jar</systemPath>
+                <scope>system</scope>
                 <version>${itcast-tools.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.itheima</groupId>
                 <artifactId>itcast-tools-databases</artifactId>
+                <systemPath>${lib.path}/lib/itcast-tools-databases-2.1.9.jar</systemPath>
+                <scope>system</scope>
                 <version>${itcast-tools.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.itheima</groupId>
                 <artifactId>itcast-tools-swagger2</artifactId>
+                <systemPath>${lib.path}/lib/itcast-tools-swagger2-2.1.9.jar</systemPath>
+                <scope>system</scope>
                 <version>${itcast-tools.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.itheima</groupId>
                 <artifactId>itcast-tools-dozer</artifactId>
+                <systemPath>${lib.path}/lib/itcast-tools-dozer-2.1.9.jar</systemPath>
+                <scope>system</scope>
                 <version>${itcast-tools.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.itheima</groupId>
                 <artifactId>itcast-tools-log</artifactId>
+                <systemPath>${lib.path}/lib/itcast-tools-log-2.1.9.jar</systemPath>
+                <scope>system</scope>
                 <version>${itcast-tools.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.itheima</groupId>
                 <artifactId>itcast-tools-validator</artifactId>
+                <systemPath>${lib.path}/lib/itcast-tools-validator-2.1.9.jar</systemPath>
+                <scope>system</scope>
                 <version>${itcast-tools.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.itheima</groupId>
                 <artifactId>itcast-tools-jwt</artifactId>
+                <systemPath>${lib.path}/lib/itcast-tools-jwt-2.1.9.jar</systemPath>
+                <scope>system</scope>
                 <version>${itcast-tools.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.itheima</groupId>
                 <artifactId>itcast-tools-xss</artifactId>
+                <systemPath>${lib.path}/lib/itcast-tools-xss-2.1.9.jar</systemPath>
+                <scope>system</scope>
                 <version>${itcast-tools.version}</version>
             </dependency>
@@ -262,13 +284,13 @@
         </dependency>
     </dependencies>
-    <repositories>
-        <repository>
-            <id>itheima</id>
-            <name>itheima</name>
-            <url>http://repo.itheima.net/repository/maven-public/</url>
-        </repository>
-    </repositories>
+<!--    <repositories>-->
+<!--        <repository>-->
+<!--            <id>itheima</id>-->
+<!--            <name>itheima</name>-->
+<!--            <url>http://repo.itheima.net/repository/maven-public/</url>-->
+<!--        </repository>-->
+<!--    </repositories>-->
     <build>