lisang
/
dts-shop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !4 from xuebaoyu/opendev

This commit is contained in:
xuebaoyu 2022-03-20 03:43:00 +00:00 committed by Gitee
parent c269c28474 29357ca8a9
commit e916198860
4 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dts-admin-api/src/main/java/com/qiguliuxing/dts/admin/api/Application.java
View File

@ -6,6 +6,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* 管理后台服务启动类
*
* @author xuebaoyu
* @QQ:1197673878
*/
@SpringBootApplication(scanBasePackages = { "com.qiguliuxing.dts.db", "com.qiguliuxing.dts.core", @SpringBootApplication(scanBasePackages = { "com.qiguliuxing.dts.db", "com.qiguliuxing.dts.core",
"com.qiguliuxing.dts.admin" }) "com.qiguliuxing.dts.admin" })
@MapperScan({ "com.qiguliuxing.dts.db.dao", "com.qiguliuxing.dts.db.dao.ex" }) @MapperScan({ "com.qiguliuxing.dts.db.dao", "com.qiguliuxing.dts.db.dao.ex" })
@ -16,5 +22,4 @@ public class Application {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(Application.class, args); SpringApplication.run(Application.class, args);
} }
} }

4
dts-wx-api/src/main/java/com/qiguliuxing/dts/wx/Application.java
View File

@ -7,7 +7,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;
/** /**
* 服务启动类 * 小程序服务启动类
* *
* @author CHENBO * @author CHENBO
* @QQ:623659388 * @QQ:623659388
@ -18,7 +18,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableTransactionManagement @EnableTransactionManagement
@EnableScheduling @EnableScheduling
public class Application { public class Application {
// 小程序后台服务启动类
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(Application.class, args); SpringApplication.run(Application.class, args);
} }

47
pom.xml
View File

@ -18,7 +18,21 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<maven.test.skip>true</maven.test.skip> <maven.test.skip>true</maven.test.skip>
<fastjson.version>1.2.70</fastjson.version> <fastjson.version>1.2.70</fastjson.version>
<jackson-databind.version>2.9.8</jackson-databind.version> <jackson-databind.version>2.9.6</jackson-databind.version>
<mybatis-spring-boot-starter.version>1.3.2</mybatis-spring-boot-starter.version>
<pagehelper-spring-boot-starter.version>1.2.5</pagehelper-spring-boot-starter.version>
<shiro-spring-boot-web-starter.version>1.4.0</shiro-spring-boot-web-starter.version>
<hibernate-validator.version>6.0.15.Final</hibernate-validator.version>
<mysql-connector-java.version>5.1.46</mysql-connector-java.version>
<druid-spring-boot-starter.version>1.1.10</druid-spring-boot-starter.version>
<weixin-java-pay.version>3.3.0</weixin-java-pay.version>
<weixin-java-miniapp.version>3.3.0</weixin-java-miniapp.version>
<qcloudsms.version>1.0.5</qcloudsms.version>
<cos_api.version>5.4.4</cos_api.version>
<aliyun-sdk-oss.version>2.5.0</aliyun-sdk-oss.version>
<qiniu-java-sdk.version>[7.2.0, 7.2.99]</qiniu-java-sdk.version>
<spring-boot-starter-json.version>2.0.4.RELEASE</spring-boot-starter-json.version>
<spring-boot-starter-mail.version>2.0.4.RELEASE</spring-boot-starter-mail.version>
</properties> </properties>
<modules> <modules>
@ -34,90 +48,89 @@
<dependency> <dependency>
<groupId>org.mybatis.spring.boot</groupId> <groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId> <artifactId>mybatis-spring-boot-starter</artifactId>
<version>1.3.2</version> <version>${mybatis-spring-boot-starter.version}</version>
</dependency> </dependency>
<!-- Spring Boot pagehelper 依赖 --> <!-- Spring Boot pagehelper 依赖 -->
<dependency> <dependency>
<groupId>com.github.pagehelper</groupId> <groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId> <artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.5</version> <version>${pagehelper-spring-boot-starter.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-web-starter</artifactId> <artifactId>shiro-spring-boot-web-starter</artifactId>
<version>1.4.0</version> <version>${shiro-spring-boot-web-starter.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate.validator</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<version>6.0.15.Final</version> <version>${hibernate-validator.version}</version>
</dependency> </dependency>
<!-- MySQL 连接驱动依赖 --> <!-- MySQL 连接驱动依赖 -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.46</version> <version>${mysql-connector-java.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId> <artifactId>druid-spring-boot-starter</artifactId>
<version>1.1.10</version> <version>${druid-spring-boot-starter.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-pay</artifactId> <artifactId>weixin-java-pay</artifactId>
<version>3.3.0</version> <version>${weixin-java-pay.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-miniapp</artifactId> <artifactId>weixin-java-miniapp</artifactId>
<version>3.3.0</version> <version>${weixin-java-miniapp.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.qcloudsms</groupId> <groupId>com.github.qcloudsms</groupId>
<artifactId>qcloudsms</artifactId> <artifactId>qcloudsms</artifactId>
<version>1.0.5</version> <version>${qcloudsms.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.qcloud</groupId> <groupId>com.qcloud</groupId>
<artifactId>cos_api</artifactId> <artifactId>cos_api</artifactId>
<version>5.4.4</version> <version>${cos_api.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.aliyun.oss</groupId> <groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId> <artifactId>aliyun-sdk-oss</artifactId>
<version>2.5.0</version> <version>${aliyun-sdk-oss.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.qiniu</groupId> <groupId>com.qiniu</groupId>
<artifactId>qiniu-java-sdk</artifactId> <artifactId>qiniu-java-sdk</artifactId>
<version>[7.2.0, 7.2.99]</version> <version>${qiniu-java-sdk.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-json</artifactId> <artifactId>spring-boot-starter-json</artifactId>
<version>2.0.4.RELEASE</version> <version>${spring-boot-starter-json.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId> <artifactId>spring-boot-starter-mail</artifactId>
<version>2.0.4.RELEASE</version> <version>${spring-boot-starter-mail.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>

2
wx-mini-program/pages/cart/cart.js
View File

@ -236,7 +236,7 @@ Page({
}); });
}); });
} else { } else {
var productIds = that.data.cartGoods.map(function (v) { productIds = that.data.cartGoods.map(function (v) {
return v.productId; return v.productId;
}); });
} }