Skip to content

Commit d859f45

Browse files
22273246892227324689
committed
增加user-service
1 parent cdf97a0 commit d859f45

38 files changed

Lines changed: 1917 additions & 78 deletions

File tree

‎.DS_Store‎

0 Bytes
Binary file not shown.

‎gpmall-commons/commons-parent/pom.xml‎

Lines changed: 82 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,88 @@
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<maven.compiler.source>1.8</maven.compiler.source>
1818
<maven.compiler.target>1.8</maven.compiler.target>
19+
<spring-boot.version>2.1.6.RELEASE</spring-boot.version>
20+
<dubbo.version>2.7.2</dubbo.version>
21+
<dubbo-spring-boot.version>2.7.1</dubbo-spring-boot.version>
22+
<curator.famework.version>4.2.0</curator.famework.version>
23+
<mybatis.version>2.1.0</mybatis.version>
24+
<druid.version>1.1.19</druid.version>
1925
</properties>
2026

21-
<dependencies>
22-
<dependency>
23-
<groupId>junit</groupId>
24-
<artifactId>junit</artifactId>
25-
<version>4.11</version>
26-
<scope>test</scope>
27-
</dependency>
28-
</dependencies>
27+
<dependencyManagement>
28+
<dependencies>
29+
<dependency>
30+
<groupId>org.springframework.boot</groupId>
31+
<artifactId>spring-boot-dependencies</artifactId>
32+
<version>${spring-boot.version}</version>
33+
<type>pom</type>
34+
<scope>import</scope>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.apache.dubbo</groupId>
38+
<artifactId>dubbo-dependencies-zookeeper</artifactId>
39+
<version>${dubbo.version}</version>
40+
<exclusions>
41+
<exclusion>
42+
<groupId>org.slf4j</groupId>
43+
<artifactId>slf4j-log4j12</artifactId>
44+
</exclusion>
45+
<exclusion>
46+
<artifactId>log4j</artifactId>
47+
<groupId>log4j</groupId>
48+
</exclusion>
49+
<exclusion>
50+
<artifactId>slf4j-api</artifactId>
51+
<groupId>org.slf4j</groupId>
52+
</exclusion>
53+
</exclusions>
54+
<type>pom</type>
55+
<scope>import</scope>
56+
</dependency>
57+
<!-- Aapche Dubbo -->
58+
<dependency>
59+
<groupId>org.apache.dubbo</groupId>
60+
<artifactId>dubbo-dependencies-bom</artifactId>
61+
<version>${dubbo.version}</version>
62+
<type>pom</type>
63+
<scope>import</scope>
64+
</dependency>
65+
66+
<dependency>
67+
<groupId>org.apache.dubbo</groupId>
68+
<artifactId>dubbo</artifactId>
69+
<version>${dubbo.version}</version>
70+
<exclusions>
71+
<exclusion>
72+
<groupId>org.springframework</groupId>
73+
<artifactId>spring</artifactId>
74+
</exclusion>
75+
<exclusion>
76+
<groupId>javax.servlet</groupId>
77+
<artifactId>servlet-api</artifactId>
78+
</exclusion>
79+
<exclusion>
80+
<groupId>log4j</groupId>
81+
<artifactId>log4j</artifactId>
82+
</exclusion>
83+
</exclusions>
84+
</dependency>
85+
86+
<dependency>
87+
<groupId>org.apache.dubbo</groupId>
88+
<artifactId>dubbo-spring-boot-starter</artifactId>
89+
<version>${dubbo-spring-boot.version}</version>
90+
</dependency>
91+
<dependency>
92+
<groupId>org.mybatis.spring.boot</groupId>
93+
<artifactId>mybatis-spring-boot-starter</artifactId>
94+
<version>${mybatis.version}</version>
95+
</dependency>
96+
<dependency>
97+
<groupId>com.alibaba</groupId>
98+
<artifactId>druid</artifactId>
99+
<version>${druid.version}</version>
100+
</dependency>
101+
</dependencies>
102+
</dependencyManagement>
29103
</project>

‎gpmall-commons/commons-support/target/commons-support-1.0-SNAPSHOT.jar‎

3.69 KB
Binary file not shown.

‎gpmall-commons/commons-support/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
com\gpmall\commons\web\ResponseData.class
2-
com\gpmall\commons\web\ResponseEnum.class
1+
com/gpmall/commons/annotation/Anoymous.class
2+
com/gpmall/commons/result/ResponseEnum.class
3+
com/gpmall/commons/result/ResponseData.class
4+
com/gpmall/commons/intercepter/TokenIntercepter.class

‎gpmall-commons/commons-tool/target/commons-tool-1.0-SNAPSHOT.jar‎

-38 Bytes
Binary file not shown.

‎gpmall-commons/commons-tool/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
com\gpmall\commons\tool\utils\CookieUtil.class

‎gpmall-commons/commons-tool/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
D:\workspace\project\gpmall\gpmall-commons\commons-tool\src\main\java\com\gpmall\commons\tool\utils\CookieUtil.java
1+
/Users/mic/Documents/software/workspace/gpmall/gpmall-commons/commons-tool/src/main/java/com/gpmall/commons/tool/utils/CookieUtil.java

‎gpmall-front/src/assets/style/theme.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// 主色
22
$main-col: #5079d9;
33
// 头部
4-
$head-bgc: #fff;
4+
$head-bgc: #1a1a1a;
55
// 字体颜色
66
$cc: #ccc;
77
$c6: #666;

‎gpmall-front/src/common/footer.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</a></div>
3131
</div>
3232
</div>
33-
<div class="footer-copy"> 本站仅用于学习交流使用，前端末班是在 <a href="http://xmall.exrick.cn/" target="_blank">xmall</a>
33+
<div class="footer-copy"> 本站仅用于学习交流使用，前端框架是在 <a href="http://xmall.exrick.cn/" target="_blank">xmall</a>
3434
基础之上做的重构，在此表示感谢</div>
3535
</div>
3636
</footer>

‎gpmall-front/src/common/header.vue‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@
119119
<li>
120120
<router-link to="/"><a @click="changGoods(-1)" :class="{active:choosePage===-1}">首页</a></router-link>
121121
</li>
122+
<li>
123+
<a @click="changGoods(-2)" :class="{active:choosePage===-2}">全部商品</a>
124+
</li>
122125
<li v-for="(item,i) in navList" :key="i">
123126
<a @click="changGoods(i, item)" :class="{active:i===choosePage}">{{item.picUrl}}</a>
124127
</li>
@@ -475,8 +478,8 @@
475478
476479
.header-box {
477480
background: $head-bgc;
478-
background-image: -webkit-linear-gradient(#000, #fff);
479-
background-image: linear-gradient(#000, #fff);
481+
background-image: -webkit-linear-gradient(#000, #121212);
482+
background-image: linear-gradient(#000, #121212);
480483
width: 100%;
481484
482485
}
@@ -574,7 +577,7 @@
574577
}
575578
// 用户
576579
.user {
577-
margin-left: 505px;
580+
margin-left: 41px;
578581
width: 36px;
579582
&:hover {
580583
a:before {

0 commit comments

Comments
 (0)