Skip to content

G
gogirl-miniapp-backend
Commit cd768a99 by huluobin
Options

upload

parent 21cabd46
Showing with 311 additions and 1 deletion
nginx.conf.bak 0 → 100644
#user nobody;
worker_processes 1;
events {
worker_connections 1024;
}
http {
include mime.types;
default_type application/octet-stream;
client_max_body_size 100m;
sendfile on;
keepalive_timeout 65;
server {
listen 80;
listen 443 ssl;
ssl_certificate ../html/1_t.begogirls.com_bundle.crt;
ssl_certificate_key ../html/2_t.begogirls.com.key;
server_name localhost;
ssl_session_cache shared:SSL:1m;
ssl_session_timeout 5m;
charset utf-8;
#access_log logs/host.access.log main;
location =/8nUqH1WcSF.txt {
root html;
index 8nUqH1WcSF.txt;
}
location =/9sLvNOrtp7.txt {
root html;
index 9sLvNOrtp7.txt;
}
location =/MP_verify_tOhGP9rsDciEElio.txt {
root html;
index MP_verify_tOhGP9rsDciEElio.txt;
}
location =/wb_443c1811625d8835.txt {
root html;
index wb_443c1811625d8835.txt;
}
location = /baidu_verify_b3yeTij43o.html{
root html;
index baidu_verify_b3yeTij43o.html;
}
location = /baidu_verify_JNe7VEdagI.html{
root html;
index baidu_verify_JNe7VEdagI.html;
}
location =/robots.txt {
root html;
index robots.txt;
}
location / {
gzip on;
gzip_min_length 1k;
gzip_comp_level 2;
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on;
gzip_disable "MSIE [1-6]\.";
try_files $uri $uri/ @router;
root /usr/local/src/gogirl-front/web/;
index index.html;
}
location ^~ /static/ {
gzip on;
gzip_min_length 1k;
gzip_comp_level 2;
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on;
gzip_disable "MSIE [1-6]\.";
try_files $uri $uri/ @router;
root /usr/local/src/gogirl-front/web/;
}
location ^~ /css/ {
gzip on;
gzip_min_length 1k;
gzip_comp_level 2;
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on;
gzip_disable "MSIE [1-6]\.";
try_files $uri $uri/ @router;
root /usr/local/src/gogirl-front/web/;
}
location ^~ /moment/ {
gzip on;
gzip_min_length 1k;
gzip_comp_level 2;
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on;
gzip_disable "MSIE [1-6]\.";
root /usr/local/src/gogirl-front/web_detail/;
}
location @router {
rewrite ^.*$ /index.html last;
}
location ^~ /members {
gzip on;
gzip_min_length 1k;
gzip_comp_level 2;
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on;
gzip_disable "MSIE [1-6]\.";
root /usr/local/src/gogirl-front/;
index index.html;
}
location ^~ /members/static/ {
gzip on;
gzip_min_length 1k;
gzip_comp_level 2;
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on;
gzip_disable "MSIE [1-6]\.";
root /usr/local/src/gogirl-front/;
}
location ^~ /members/css/ {
gzip on;
gzip_min_length 1k;
gzip_comp_level 2;
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on;
gzip_disable "MSIE [1-6]\.";
root /usr/local/src/gogirl-front/;
}
location ^~ /d {
gzip on;
gzip_min_length 1k;
gzip_comp_level 2;
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on;
gzip_disable "MSIE [1-6]\.";
root /usr/local/src/gogirl-front/;
index index.html;
}
location ^~ /d/static/ {
gzip on;
gzip_min_length 1k;
gzip_comp_level 2;
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on;
gzip_disable "MSIE [1-6]\.";
root /usr/local/src/gogirl-front/;
}
location ^~ /d/css/ {
gzip on;
gzip_min_length 1k;
gzip_comp_level 2;
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on;
gzip_disable "MSIE [1-6]\.";
root /usr/local/src/gogirl-front/;
}
location ^~ /store {
gzip on;
gzip_min_length 1k;
gzip_comp_level 2;
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on;
gzip_disable "MSIE [1-6]\.";
root /usr/local/src/gogirl-front/;
}
location ^~ /store/static/ {
gzip on;
gzip_min_length 1k;
gzip_comp_level 2;
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on;
gzip_disable "MSIE [1-6]\.";
root /usr/local/src/gogirl-front/;
}
location ^~ /store/css/ {
gzip on;
gzip_min_length 1k;
gzip_comp_level 2;
gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
gzip_vary on;
gzip_disable "MSIE [1-6]\.";
root /usr/local/src/gogirl-front/;
}
location ^~ /weibo {
root /usr/local/src/gogirl-front/;
}
location ^~ /weibo/static/ {
root /usr/local/src/gogirl-front/;
}
location ^~ /weibo/css/ {
root /usr/local/src/gogirl-front/;
}
location ^~ /gogirl/ {
proxy_pass http://127.0.0.1:8090;
}
location ^~ /gogirl_web_store/ {
proxy_pass http://127.0.0.1:8086;
}
location ^~ /gogirl_mp/ {
proxy_pass http://127.0.0.1:8088;
}
location ^~ /picture/ {
root /usr/local/src/;
}
location ^~ /gogirl-service/ueditor/exec {
proxy_pass http://127.0.0.1:8082;
}
location ^~ /gogirl_user/weiboInfo {
proxy_pass http://127.0.0.1:8089;
}
location /gogirl-service/ {
proxy_pass http://127.0.0.1:8082;
}
location /gogirl-order/orderExport/listExportOrder {
proxy_pass http://127.0.0.1:8084;
}
location ^~ /gogirl_xcx/ {
proxy_pass http://127.0.0.1:8092;
}
location ^~ /miniapp/customer/ {
proxy_pass http://127.0.0.1:5555;
}
location ^~ /miniapp/technician {
proxy_pass http://127.0.0.1:5555;
}
location ^~ /customer/ {
proxy_pass http://127.0.0.1:5444;
}
location ^~ /technician/ {
proxy_pass http://127.0.0.1:5444;
}
location ^~ /gogirl-order/websocket/ {
proxy_pass http://127.0.0.1:8084;
proxy_http_version 1.1;
proxy_read_timeout 3600s;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
location ^~ /gogirl_purchase/ {
proxy_pass http://127.0.0.1:8091;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;
}
}
}
src/main/java/com/gogirl/domain/product/purchase/PurchaseStock.java
......@@ -27,6 +27,8 @@ public class PurchaseStock implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.AUTO)
private Integer id;
@ApiModelProperty(value = "商品sku")
private String sku;
......
src/main/java/com/gogirl/domain/product/purchase/PurchaseStockRecord.java
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -23,6 +24,7 @@ import java.time.LocalDateTime;
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "PurchaseStockRecord对象", description = "出入库记录表")
@Builder
public class PurchaseStockRecord implements Serializable {
private static final long serialVersionUID = 1L;
......
src/main/java/com/gogirl/interfaces/xcx/XcxController.java
......@@ -149,4 +149,11 @@ public class XcxController {
String imgUrl = ImageUtil.saveImage(gogirlProperties.getPicturePath(), file);
return JsonResult.success(imgUrl);
}
@ApiOperation(value = "图片上传")
@RequestMapping("/customer/testTimeOut")
public JsonResult<Void> testTimeOut() throws InterruptedException {
Thread.sleep(36000L);
return JsonResult.success();
}
}
src/main/resources/application.yml
spring:
profiles:
active: pre
active: prod
servlet:
#文件上传最大容量
multipart:
......
src/test/java/com/gogirl/Test.java
......@@ -11,6 +11,8 @@ import com.gogirl.domain.order.pay.OrderPay;
import com.gogirl.domain.order.serve.MultiPaymentType;
import com.gogirl.domain.order.serve.OrderManage;
import com.gogirl.domain.order.serve.OrderServe;
import com.gogirl.domain.product.purchase.PurchaseStock;
import com.gogirl.domain.product.purchase.PurchaseStockRecord;
import com.gogirl.domain.store.complaint.ComplaintDetailed;
import com.gogirl.domain.store.complaint.ComplaintDetailedTechnician;
import com.gogirl.domain.store.complaint.ComplaintMain;
......@@ -25,6 +27,8 @@ import com.gogirl.infrastructure.mapper.market.timescard.TimesCardCustomerReleva
import com.gogirl.infrastructure.mapper.order.pay.OrderPayMapper;
import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper;
import com.gogirl.infrastructure.mapper.order.serve.OrderServeMapper;
import com.gogirl.infrastructure.mapper.product.purchase.PurchaseStockMapper;
import com.gogirl.infrastructure.mapper.product.purchase.PurchaseStockRecordMapper;
import com.gogirl.infrastructure.mapper.store.complaint.ComplaintDetailedMapper;
import com.gogirl.infrastructure.mapper.store.complaint.ComplaintDetailedTechnicianMapper;
import com.gogirl.infrastructure.mapper.store.complaint.ComplaintMainMapper;
......@@ -42,6 +46,7 @@ import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.Date;
import java.util.List;
......@@ -517,4 +522,40 @@ public class Test {
// });
// }
@Resource
PurchaseStockMapper purchaseStockMapper;
@Resource
PurchaseStockRecordMapper purchaseStockRecordMapper;
@org.junit.Test
public void stockTest() {
List<PurchaseStock> purchaseStockList = purchaseStockMapper.selectList(
new LambdaQueryWrapper<PurchaseStock>()
.eq(PurchaseStock::getDepartmentId, 0)
.ge(PurchaseStock::getSku, "MJJ00006")
.le(PurchaseStock::getSku, "MJJ00233")
.gt(PurchaseStock::getNum, 0));
purchaseStockList.forEach(purchaseStock -> {
purchaseStock.setNum(purchaseStock.getNum() - 1);
purchaseStockMapper.updateById(purchaseStock);
PurchaseStockRecord purchaseStockRecord = PurchaseStockRecord.builder()
.stockId(purchaseStock.getId())
.stockQuantity(purchaseStock.getNum())
.departmentId(0)
.quantity(1)
.remarks("excel批量出库")
.sku(purchaseStock.getSku())
.time(LocalDateTime.now())
.type(2)
.typeRemarks("excel批量出库")
.build();
purchaseStockRecordMapper.insert(purchaseStockRecord);
});
}
}
Markdown is supported
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