microservice / itcast-authority · Commits

Commit 229f61c456deb83b96df20c1e345fa622fa80187

Authored by sl
1 parent dfc7ee22

fix:修复jar以及依赖问题

Inline Side-by-side
Showing 23 changed files with 124 additions and 52 deletions
itcast-auth/itcast-auth-api/pom.xml
  View file @229f61c
... ... @@ -62,18 +62,18 @@
62 62 </dependency>
63 63 </dependencies>
64 64  
65   - <distributionManagement>
66   - <repository>
67   - <id>nexus-release</id>
68   - <name>Nexus release Repository</name>
69   - <url>http://repo.itheima.net/repository/maven-releases/</url>
70   - </repository>
71   - <snapshotRepository>
72   - <id>nexus-snapshots</id>
73   - <name>Nexus snapshots Repository</name>
74   - <url>http://repo.itheima.net/repository/maven-snapshots/</url>
75   - </snapshotRepository>
76   - </distributionManagement>
  65 +<!-- <distributionManagement>-->
  66 +<!-- <repository>-->
  67 +<!-- <id>nexus-release</id>-->
  68 +<!-- <name>Nexus release Repository</name>-->
  69 +<!-- <url>http://repo.itheima.net/repository/maven-releases/</url>-->
  70 +<!-- </repository>-->
  71 +<!-- <snapshotRepository>-->
  72 +<!-- <id>nexus-snapshots</id>-->
  73 +<!-- <name>Nexus snapshots Repository</name>-->
  74 +<!-- <url>http://repo.itheima.net/repository/maven-snapshots/</url>-->
  75 +<!-- </snapshotRepository>-->
  76 +<!-- </distributionManagement>-->
77 77  
78 78 <build>
79 79 <plugins>
... ...
itcast-auth/itcast-auth-entity/pom.xml
  View file @229f61c
... ... @@ -6,7 +6,7 @@
6 6 <artifactId>itcast-auth</artifactId>
7 7 <groupId>com.itheima</groupId>
8 8 <version>1.0.0</version>
9   - <relativePath>../</relativePath>
  9 + <relativePath>../pom.xml</relativePath>
10 10 </parent>
11 11 <modelVersion>4.0.0</modelVersion>
12 12  
... ... @@ -26,7 +26,18 @@
26 26 <groupId>com.itheima</groupId>
27 27 <artifactId>itcast-tools-jwt</artifactId>
28 28 </dependency>
29   -
  29 + <dependency>
  30 + <groupId>com.itheima</groupId>
  31 + <artifactId>itcast-tools-core</artifactId>
  32 + </dependency>
  33 + <dependency>
  34 + <groupId>com.itheima</groupId>
  35 + <artifactId>itcast-tools-swagger2</artifactId>
  36 + </dependency>
  37 + <dependency>
  38 + <groupId>com.itheima</groupId>
  39 + <artifactId>itcast-tools-validator</artifactId>
  40 + </dependency>
30 41 <dependency>
31 42 <groupId>com.baomidou</groupId>
32 43 <artifactId>mybatis-plus</artifactId>
... ... @@ -43,22 +54,34 @@
43 54 <dependency>
44 55 <groupId>com.itheima</groupId>
45 56 <artifactId>itcast-tools-databases</artifactId>
46   - <optional>true</optional>
  57 + </dependency>
  58 + <dependency>
  59 + <groupId>io.swagger</groupId>
  60 + <artifactId>swagger-annotations</artifactId>
  61 + <version>1.5.22</version>
47 62 <scope>compile</scope>
48 63 </dependency>
  64 + <dependency>
  65 + <groupId>org.hibernate.validator</groupId>
  66 + <artifactId>hibernate-validator</artifactId>
  67 + </dependency>
  68 + <dependency>
  69 + <groupId>com.fasterxml.jackson.core</groupId>
  70 + <artifactId>jackson-annotations</artifactId>
  71 + </dependency>
49 72 </dependencies>
50 73  
51 74  
52   - <distributionManagement>
53   - <repository>
54   - <id>nexus-release</id>
55   - <name>Nexus release Repository</name>
56   - <url>http://repo.itheima.net/repository/maven-releases/</url>
57   - </repository>
58   - <snapshotRepository>
59   - <id>nexus-snapshots</id>
60   - <name>Nexus snapshots Repository</name>
61   - <url>http://repo.itheima.net/repository/maven-snapshots/</url>
62   - </snapshotRepository>
63   - </distributionManagement>
  75 +<!-- <distributionManagement>-->
  76 +<!-- <repository>-->
  77 +<!-- <id>nexus-release</id>-->
  78 +<!-- <name>Nexus release Repository</name>-->
  79 +<!-- <url>http://repo.itheima.net/repository/maven-releases/</url>-->
  80 +<!-- </repository>-->
  81 +<!-- <snapshotRepository>-->
  82 +<!-- <id>nexus-snapshots</id>-->
  83 +<!-- <name>Nexus snapshots Repository</name>-->
  84 +<!-- <url>http://repo.itheima.net/repository/maven-snapshots/</url>-->
  85 +<!-- </snapshotRepository>-->
  86 +<!-- </distributionManagement>-->
64 87 </project>
... ...
itcast-auth/itcast-auth-entity/src/main/java/com/itheima/authority/dto/core/OrgUserTreeDTO.java
  View file @229f61c
1 1 package com.itheima.authority.dto.core;
2 2  
  3 +import cn.hutool.core.collection.CollectionUtil;
3 4 import com.itheima.tools.model.ITreeNode;
4 5 import io.swagger.annotations.ApiModel;
5 6 import lombok.Builder;
6 7 import lombok.Data;
7 8 import lombok.ToString;
8   -import org.springframework.util.CollectionUtils;
9 9  
10 10 import java.util.List;
11 11  
... ... @@ -25,7 +25,7 @@ public class OrgUserTreeDTO implements ITreeNode&lt;OrgUserTreeDTO, Long&gt; {
25 25 private Integer type;
26 26  
27 27 public Boolean getEnable() {
28   - if (type == 1 && CollectionUtils.isEmpty(children)) {
  28 + if (type == 1 && CollectionUtil.isEmpty(children)) {
29 29 return false;
30 30 }
31 31 return true;
... ...
itcast-auth/itcast-auth-entity/src/main/java/com/itheima/authority/entity/core/Org.java
  View file @229f61c
... ... @@ -4,7 +4,6 @@ import java.time.LocalDateTime;
4 4  
5 5 import javax.validation.constraints.NotEmpty;
6 6  
7   -import com.baomidou.mybatisplus.annotation.FieldFill;
8 7 import com.baomidou.mybatisplus.annotation.TableField;
9 8 import com.baomidou.mybatisplus.annotation.TableName;
10 9 import com.itheima.tools.base.entity.Entity;
... ... @@ -12,7 +11,6 @@ import com.itheima.tools.base.entity.Entity;
12 11 import io.swagger.annotations.ApiModel;
13 12 import io.swagger.annotations.ApiModelProperty;
14 13 import lombok.AllArgsConstructor;
15   -import lombok.Builder;
16 14 import lombok.Data;
17 15 import lombok.EqualsAndHashCode;
18 16 import lombok.NoArgsConstructor;
... ...
itcast-auth/itcast-auth-server/pom.xml
  View file @229f61c
... ... @@ -6,7 +6,7 @@
6 6 <groupId>com.itheima</groupId>
7 7 <artifactId>itcast-auth</artifactId>
8 8 <version>1.0.0</version>
9   - <relativePath>../</relativePath>
  9 + <relativePath>../pom.xml</relativePath>
10 10 </parent>
11 11 <modelVersion>4.0.0</modelVersion>
12 12  
... ... @@ -81,7 +81,10 @@
81 81 <groupId>commons-codec</groupId>
82 82 <artifactId>commons-codec</artifactId>
83 83 </dependency>
84   -
  84 + <dependency>
  85 + <groupId>com.itheima</groupId>
  86 + <artifactId>itcast-tools-common</artifactId>
  87 + </dependency>
85 88 <dependency>
86 89 <groupId>com.itheima</groupId>
87 90 <artifactId>itcast-tools-j2cache</artifactId>
... ... @@ -99,6 +102,17 @@
99 102 <artifactId>itcast-tools-xss</artifactId>
100 103 </dependency>
101 104 <dependency>
  105 + <groupId>net.oschina.j2cache</groupId>
  106 + <artifactId>j2cache-core</artifactId>
  107 + <scope>system</scope>
  108 + <systemPath>${lib.path}/lib/j2cache-core-2.4.1-release.jar</systemPath>
  109 + <version>2.4.1-release</version>
  110 + </dependency>
  111 + <dependency>
  112 + <groupId>com.alibaba</groupId>
  113 + <artifactId>druid-spring-boot-starter</artifactId>
  114 + </dependency>
  115 + <dependency>
102 116 <groupId>com.alibaba.cloud</groupId>
103 117 <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
104 118 <exclusions>
... ... @@ -171,6 +185,16 @@
171 185 <artifactId>easypoi-spring-boot-starter</artifactId>
172 186 <version>4.1.3</version>
173 187 </dependency>
  188 + <dependency>
  189 + <groupId>eu.bitwalker</groupId>
  190 + <artifactId>UserAgentUtils</artifactId>
  191 + <version>1.21</version>
  192 + </dependency>
  193 + <dependency>
  194 + <groupId>p6spy</groupId>
  195 + <artifactId>p6spy</artifactId>
  196 + <version>3.9.1</version>
  197 + </dependency>
174 198 </dependencies>
175 199  
176 200 <build>
... ...
itcast-auth/itcast-auth-server/src/main/java/com/itheima/authority/biz/service/auth/impl/AuthManager.java
  View file @229f61c
... ... @@ -98,7 +98,7 @@ public class AuthManager {
98 98 * @return
99 99 */
100 100 private Token getToken(User user) {
101   - JwtUserInfo userInfo = new JwtUserInfo(user.getId(), user.getAccount(), user.getName(), user.getOrgId(), user.getStationId());
  101 + JwtUserInfo userInfo = new JwtUserInfo(user.getId(), user.getAccount(), user.getName(), user.getOrgId(), user.getStationId(),null,false);
102 102  
103 103 Token token = this.jwtTokenServerUtils.generateUserToken(userInfo, null);
104 104 log.info("token={}", token.getToken());
... ...
itcast-auth/itcast-auth-server/src/main/java/com/itheima/authority/config/datasource/AuthorityDatabaseAutoConfiguration.java
  View file @229f61c
... ... @@ -6,18 +6,10 @@ import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
6 6 import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
7 7 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
8 8 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusPropertiesCustomizer;
9   -import com.baomidou.mybatisplus.core.parser.ISqlParser;
10   -import com.baomidou.mybatisplus.extension.parsers.BlockAttackSqlParser;
11   -import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
12   -import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler;
13   -import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser;
14 9 import com.itheima.tools.database.datasource.BaseDatabaseConfiguration;
15 10 import com.itheima.tools.database.properties.DatabaseProperties;
16 11 import com.p6spy.engine.spy.P6DataSource;
17 12 import lombok.extern.slf4j.Slf4j;
18   -import net.sf.jsqlparser.expression.Expression;
19   -import net.sf.jsqlparser.expression.LongValue;
20   -import net.sf.jsqlparser.expression.NullValue;
21 13 import org.apache.ibatis.mapping.DatabaseIdProvider;
22 14 import org.apache.ibatis.plugin.Interceptor;
23 15 import org.apache.ibatis.scripting.LanguageDriver;
... ...
itcast-auth/pom.xml
  View file @229f61c
... ... @@ -15,6 +15,7 @@
15 15 <description>传智权限管家-权限服务</description>
16 16 <packaging>pom</packaging>
17 17 <modules>
  18 + <module>itcast-auth-api</module>
18 19 <module>itcast-auth-entity</module>
19 20 <module>itcast-auth-server</module>
20 21 </modules>
... ...
itcast-gateway/pom.xml
  View file @229f61c
... ... @@ -21,6 +21,10 @@
21 21 </dependency>
22 22 <dependency>
23 23 <groupId>com.itheima</groupId>
  24 + <artifactId>itcast-tools-core</artifactId>
  25 + </dependency>
  26 + <dependency>
  27 + <groupId>com.itheima</groupId>
24 28 <artifactId>itcast-tools-log</artifactId>
25 29 <exclusions>
26 30 <exclusion>
... ... @@ -46,6 +50,7 @@
46 50 <dependency>
47 51 <groupId>com.itheima</groupId>
48 52 <artifactId>itcast-auth-api</artifactId>
  53 + <version>1.0.1</version>
49 54 </dependency>
50 55  
51 56 <dependency>
... ... @@ -91,6 +96,13 @@
91 96 <artifactId>knife4j-spring-ui</artifactId>
92 97 <version>2.0.3</version>
93 98 </dependency>
  99 + <dependency>
  100 + <groupId>net.oschina.j2cache</groupId>
  101 + <artifactId>j2cache-core</artifactId>
  102 + <scope>system</scope>
  103 + <systemPath>${lib.path}/lib/j2cache-core-2.4.1-release.jar</systemPath>
  104 + <version>2.4.1-release</version>
  105 + </dependency>
94 106 </dependencies>
95 107  
96 108 <build>
... ...
lib/itcast-auth-entity-1.0.8-SNAPSHOT.jar 0 → 100644
View file @229f61c
No preview for this file type
lib/itcast-tools-common-2.1.9.jar 0 → 100644
View file @229f61c
No preview for this file type
lib/itcast-tools-core-2.1.9.jar 0 → 100644
View file @229f61c
No preview for this file type
lib/itcast-tools-databases-2.1.9.jar 0 → 100644
View file @229f61c
No preview for this file type
lib/itcast-tools-dozer-2.1.9.jar 0 → 100644
View file @229f61c
No preview for this file type
lib/itcast-tools-j2cache-2.1.9.jar 0 → 100644
View file @229f61c
No preview for this file type
lib/itcast-tools-jwt-2.1.9.jar 0 → 100644
View file @229f61c
No preview for this file type
lib/itcast-tools-log-2.1.9.jar 0 → 100644
View file @229f61c
No preview for this file type
lib/itcast-tools-swagger2-2.1.9.jar 0 → 100644
View file @229f61c
No preview for this file type
lib/itcast-tools-user-2.1.9.jar 0 → 100644
View file @229f61c
No preview for this file type
lib/itcast-tools-validator-2.1.9.jar 0 → 100644
View file @229f61c
No preview for this file type
lib/itcast-tools-xss-2.1.9.jar 0 → 100644
View file @229f61c
No preview for this file type
lib/j2cache-core-2.4.1-release.jar 0 → 100644
View file @229f61c
No preview for this file type
... ... @@ -69,7 +69,7 @@
69 69  
70 70 <properties>
71 71 <itcast-api.version>LATEST</itcast-api.version>
72   - <itcast-tools.version>LATEST</itcast-tools.version>
  72 + <itcast-tools.version>2.1.9</itcast-tools.version>
73 73  
74 74 <java.version>1.8</java.version>
75 75 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
... ... @@ -96,6 +96,7 @@
96 96 <guava.version>20.0</guava.version>
97 97 <hutool.version>5.1.0</hutool.version>
98 98 <easy-captcha.version>1.6.2</easy-captcha.version>
  99 + <lib.path>D:/code/itcast-authority</lib.path>
99 100 </properties>
100 101  
101 102 <dependencyManagement>
... ... @@ -125,68 +126,89 @@
125 126 <dependency>
126 127 <groupId>com.itheima</groupId>
127 128 <artifactId>itcast-auth-entity</artifactId>
128   - <version>${itcast-tools.version}</version>
  129 + <version>1.0.0</version>
129 130 </dependency>
130 131 <dependency>
131 132 <groupId>com.itheima</groupId>
132 133 <artifactId>itcast-auth-api</artifactId>
133 134 <version>${itcast-api.version}</version>
134 135 </dependency>
135   -
136 136 <!-- itcast-tools -->
137 137 <dependency>
138 138 <groupId>com.itheima</groupId>
139 139 <artifactId>itcast-tools-common</artifactId>
  140 + <systemPath>${lib.path}/lib/itcast-tools-common-2.1.9.jar</systemPath>
  141 + <scope>system</scope>
140 142 <version>${itcast-tools.version}</version>
141 143 </dependency>
142 144 <dependency>
143 145 <groupId>com.itheima</groupId>
144 146 <artifactId>itcast-tools-j2cache</artifactId>
  147 + <systemPath>${lib.path}/lib/itcast-tools-j2cache-2.1.9.jar</systemPath>
  148 + <scope>system</scope>
145 149 <version>${itcast-tools.version}</version>
146 150 </dependency>
147 151 <dependency>
148 152 <groupId>com.itheima</groupId>
149 153 <artifactId>itcast-tools-user</artifactId>
  154 + <systemPath>${lib.path}/lib/itcast-tools-user-2.1.9.jar</systemPath>
  155 + <scope>system</scope>
150 156 <version>${itcast-tools.version}</version>
151 157 </dependency>
152 158 <dependency>
153 159 <groupId>com.itheima</groupId>
154 160 <artifactId>itcast-tools-core</artifactId>
  161 + <systemPath>${lib.path}/lib/itcast-tools-core-2.1.9.jar</systemPath>
  162 + <scope>system</scope>
155 163 <version>${itcast-tools.version}</version>
156 164 </dependency>
157 165 <dependency>
158 166 <groupId>com.itheima</groupId>
159 167 <artifactId>itcast-tools-databases</artifactId>
  168 + <systemPath>${lib.path}/lib/itcast-tools-databases-2.1.9.jar</systemPath>
  169 + <scope>system</scope>
160 170 <version>${itcast-tools.version}</version>
161 171 </dependency>
162 172 <dependency>
163 173 <groupId>com.itheima</groupId>
164 174 <artifactId>itcast-tools-swagger2</artifactId>
  175 + <systemPath>${lib.path}/lib/itcast-tools-swagger2-2.1.9.jar</systemPath>
  176 + <scope>system</scope>
165 177 <version>${itcast-tools.version}</version>
166 178 </dependency>
167 179 <dependency>
168 180 <groupId>com.itheima</groupId>
169 181 <artifactId>itcast-tools-dozer</artifactId>
  182 + <systemPath>${lib.path}/lib/itcast-tools-dozer-2.1.9.jar</systemPath>
  183 + <scope>system</scope>
170 184 <version>${itcast-tools.version}</version>
171 185 </dependency>
172 186 <dependency>
173 187 <groupId>com.itheima</groupId>
174 188 <artifactId>itcast-tools-log</artifactId>
  189 + <systemPath>${lib.path}/lib/itcast-tools-log-2.1.9.jar</systemPath>
  190 + <scope>system</scope>
175 191 <version>${itcast-tools.version}</version>
176 192 </dependency>
177 193 <dependency>
178 194 <groupId>com.itheima</groupId>
179 195 <artifactId>itcast-tools-validator</artifactId>
  196 + <systemPath>${lib.path}/lib/itcast-tools-validator-2.1.9.jar</systemPath>
  197 + <scope>system</scope>
180 198 <version>${itcast-tools.version}</version>
181 199 </dependency>
182 200 <dependency>
183 201 <groupId>com.itheima</groupId>
184 202 <artifactId>itcast-tools-jwt</artifactId>
  203 + <systemPath>${lib.path}/lib/itcast-tools-jwt-2.1.9.jar</systemPath>
  204 + <scope>system</scope>
185 205 <version>${itcast-tools.version}</version>
186 206 </dependency>
187 207 <dependency>
188 208 <groupId>com.itheima</groupId>
189 209 <artifactId>itcast-tools-xss</artifactId>
  210 + <systemPath>${lib.path}/lib/itcast-tools-xss-2.1.9.jar</systemPath>
  211 + <scope>system</scope>
190 212 <version>${itcast-tools.version}</version>
191 213 </dependency>
192 214  
... ... @@ -262,13 +284,13 @@
262 284 </dependency>
263 285 </dependencies>
264 286  
265   - <repositories>
266   - <repository>
267   - <id>itheima</id>
268   - <name>itheima</name>
269   - <url>http://repo.itheima.net/repository/maven-public/</url>
270   - </repository>
271   - </repositories>
  287 +<!-- <repositories>-->
  288 +<!-- <repository>-->
  289 +<!-- <id>itheima</id>-->
  290 +<!-- <name>itheima</name>-->
  291 +<!-- <url>http://repo.itheima.net/repository/maven-public/</url>-->
  292 +<!-- </repository>-->
  293 +<!-- </repositories>-->
272 294  
273 295  
274 296 <build>
... ...