Skip to content
GitLab
Commit fb5e4afc authored by Menethil's avatar Menethil
Browse files

Merge branch 'master' into dev 

# Conflicts:
#	litemall-admin/config/dep.env.js
parents 9a5cd455 cd8441e8
Expand all Hide whitespace changes
Inline Side-by-side
doc/pic1/1-9.png
View replaced file @ 9a5cd455 View file @ fb5e4afc
doc/pic1/1-9.png

204 KB | W: | H:

doc/pic1/1-9.png

137 KB | W: | H:

doc/pic1/1-9.png
doc/pic1/1-9.png
doc/pic1/1-9.png
doc/pic1/1-9.png
  • 2-up
  • Swipe
  • Onion skin
doc/2.md → doc/platform.md
View file @ fb5e4afc
......@@ -7,8 +7,6 @@
* litemall-db模块
* litemall-all模块
实际上，litemall**真正的基础系统**是litemall-core模块和litemall-db模块。
litemall-all模块则只是一个包裹模块，几乎没有任何代码。该模块的作用是融合两个spring boot模块
和litemall-admin模块静态文件到一个单独spring boot应用中，并最终打包成war格式的项目安装包。
......
doc/1.md → doc/project.md
View file @ fb5e4afc
This diff is collapsed.
doc/3.md → doc/wxmall.md
View file @ fb5e4afc
......@@ -12,12 +12,6 @@
目前发现存在的一些问题：
* `严重`账号登录和注册中验证码
注意：
> 这里之所以没有实现，是因为需要接入云平台的短信服务。
> 后期可能接入腾讯的短信服务。
* `缺失`优惠券功能
* `缺失`商品评价中管理员回复功能，进一步地用户之间相互评价回复
* `缺失`后台服务返回的token存在有效期，小商场应该自动刷新
......@@ -36,7 +30,6 @@
* `改善`商品的订单中支持订单号搜索功能
* `改善`在一些内容比较多的页面中支持“顶部”功能
* `功能`目前已经有账号登录页面，可以再支持手机短信登录方式。
* `功能`个人页面支持联系客服
* `功能`个人页面支持帮助中心
* `功能`推荐功能，基于用户的一些信息，在合适的页面给出推荐商品
......@@ -50,10 +43,12 @@
开发者在微信小程序官网申请以后，可以有app-id和app-secret信息。
1. 在litemall-wx-api模块的src/main/resources的资源文件中设置
1. 在litemall-core模块的src/main/resources的资源文件中设置
```
wx.app-id=开发者申请的app-id
wx.app-secret=开发者申请的app-secret
litemall
wx
app-id=开发者申请的app-id
app-secret=开发者申请的app-secret
```
2. 在litemall-wx模块的project.config.json文件中设置
......
litemall-admin-api/pom.xml
View file @ fb5e4afc
......@@ -29,21 +29,6 @@
</dependencies>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
<filtering>false</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
......
litemall-admin/config/dep.env.js
View file @ fb5e4afc
module.exports = {
NODE_ENV: '"production"',
ENV_CONFIG: '"dep"',
BASE_API: '"http://localhost:8083/admin"'
ENV_CONFIG: '"dep"',
BASE_API: '"http://122.152.206.172:8080/admin"'
}
litemall-admin/config/dev.env.js
View file @ fb5e4afc
module.exports = {
NODE_ENV: '"development"',
ENV_CONFIG: '"dev"',
BASE_API: '"http://localhost:8083/admin"'
ENV_CONFIG: '"dev"',
BASE_API: '"http://localhost:8080/admin"'
}
litemall-all/pom.xml
View file @ fb5e4afc
......@@ -60,6 +60,19 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<executable>true</executable>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
<configuration>
<classifier>exec</classifier>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
......
litemall-all/src/main/resources/application.yml
View file @ fb5e4afc
......@@ -12,6 +12,8 @@ logging:
root: ERROR
org.springframework: ERROR
org.mybatis: ERROR
org.linlinjava.litemall.admin: DEBUG
org.linlinjava.litemall.wx: DEBUG
org.linlinjava.litemall: DEBUG
\ No newline at end of file
org.linlinjava.litemall.core: ERROR
org.linlinjava.litemall.db: ERROR
org.linlinjava.litemall.admin: ERROR
org.linlinjava.litemall.wx: ERROR
org.linlinjava.litemall: ERROR
\ No newline at end of file
litemall-core/pom.xml
View file @ fb5e4afc
......@@ -89,20 +89,4 @@
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
<filtering>false</filtering>
</resource>
</resources>
</build>
</project>
\ No newline at end of file
litemall-core/src/main/java/org/linlinjava/litemall/core/storage/LocalStorage.java
View file @ fb5e4afc
......@@ -20,7 +20,6 @@ public class LocalStorage implements Storage {
private String storagePath;
private String address;
private String port;
private Path rootLocation;
......@@ -47,15 +46,6 @@ public class LocalStorage implements Storage {
this.address = address;
}
public String getPort() {
return port;
}
public void setPort(String port) {
this.port = port;
}
@Override
public void store(MultipartFile file, String keyName) {
try {
......
litemall-core/src/main/java/org/linlinjava/litemall/core/storage/config/StorageAutoConfiguration.java
View file @ fb5e4afc
......@@ -45,7 +45,6 @@ public class StorageAutoConfiguration {
LocalStorage localStorage = new LocalStorage();
StorageProperties.Local local = this.properties.getLocal();
localStorage.setAddress(local.getAddress());
localStorage.setPort(local.getPort());
localStorage.setStoragePath(local.getStoragePath());
return localStorage;
}
......
litemall-core/src/main/java/org/linlinjava/litemall/core/storage/config/StorageProperties.java
View file @ fb5e4afc
......@@ -43,7 +43,6 @@ public class StorageProperties {
public static class Local {
private String address;
private String port;
private String storagePath;
public String getAddress() {
......@@ -54,14 +53,6 @@ public class StorageProperties {
this.address = address;
}
public String getPort() {
return port;
}
public void setPort(String port) {
this.port = port;
}
public String getStoragePath() {
return storagePath;
}
......
litemall-core/src/main/resources/application-core.yml
View file @ fb5e4afc
......@@ -88,8 +88,8 @@ litemall:
# 本地对象存储配置信息
local:
storagePath: storage
address: http://localhost:8082/wx/storage/fetch/
port: 8081
# 这个地方应该是wx模块的WxStorageController的fetch方法对应的地址
address: http://localhost:8080/wx/storage/fetch/
# 阿里云对象存储配置信息
aliyun:
endpoint: oss-cn-shenzhen.aliyuncs.com
......
litemall-db/pom.xml
View file @ fb5e4afc
......@@ -41,22 +41,6 @@
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
<filtering>false</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.mybatis.generator</groupId>
......
litemall-wx-api/pom.xml
View file @ fb5e4afc
......@@ -56,22 +56,6 @@
</dependencies>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
<filtering>false</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
......
litemall-wx/config/api.js
View file @ fb5e4afc
// 以下是业务服务器API地址
// 本机开发时使用
// var WxApiRoot = 'http://localhost:8082/wx/';
// var WxApiRoot = 'http://localhost:8080/wx/';
// 局域网测试使用
// var WxApiRoot = 'http://192.168.0.101:8082/wx/';
// var WxApiRoot = 'http://192.168.0.101:8080/wx/';
// 云平台部署时使用
var WxApiRoot = 'http://122.152.206.172:8082/wx/';
var WxApiRoot = 'http://122.152.206.172:8080/wx/';
// 云平台上线时使用
// var WxApiRoot = 'https://www.menethil.com.cn/wx/';
......
pom.xml
View file @ fb5e4afc
......@@ -49,6 +49,11 @@
<artifactId>litemall-admin-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.linlinjava</groupId>
<artifactId>litemall-all</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment