Skip to content

G
gogirl-miniapp-backend
Commit 5e8b37de by huluobin
Options

公众号项目结构调整

parent e4be7e12
Showing with 2 additions and 431 deletions
SyncGogirlProd.sql deleted 100644 → 0
ALTER TABLE `bailun_gogirl`.`base_produce` ADD COLUMN `sales_num` int(11) NULL DEFAULT NULL COMMENT '销量' AFTER `produce_label_id`;
ALTER TABLE `bailun_gogirl`.`base_produce` ADD COLUMN `serve_type_id` int(11) NULL DEFAULT NULL COMMENT '服务类型id' AFTER `sales_num`;
ALTER TABLE `bailun_gogirl`.`career` ADD COLUMN `tech_score` int(21) NOT NULL DEFAULT 0 AFTER `total_serve_num`;
ALTER TABLE `bailun_gogirl`.`career_works` MODIFY COLUMN `id` bigint(20) NOT NULL FIRST;
ALTER TABLE `bailun_gogirl`.`career_works` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT;
ALTER TABLE `bailun_gogirl`.`career_works_images` MODIFY COLUMN `id` bigint(20) NOT NULL FIRST;
ALTER TABLE `bailun_gogirl`.`career_works_images` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT;
ALTER TABLE `bailun_gogirl`.`coupon_customer_relevance` MODIFY COLUMN `state` int(11) NOT NULL COMMENT '该优惠券使用状态1.正常,2.已使用,3.已过期' AFTER `coupon_id`;
ALTER TABLE `bailun_gogirl`.`coupon_customer_relevance` MODIFY COLUMN `discount_amount` decimal(19, 0) NULL DEFAULT NULL AFTER `coupon_name`;
ALTER TABLE `bailun_gogirl`.`coupon_customer_relevance` MODIFY COLUMN `pay_amount` decimal(19, 0) NULL DEFAULT NULL AFTER `order_id`;
ALTER TABLE `bailun_gogirl`.`coupon_customer_relevance` MODIFY COLUMN `reaching_amount` decimal(19, 0) NULL DEFAULT NULL AFTER `pay_amount`;
ALTER TABLE `bailun_gogirl`.`coupon_customer_relevance` MODIFY COLUMN `is_calc_achievement` int(11) NOT NULL DEFAULT 0 AFTER `type`;
ALTER TABLE `bailun_gogirl`.`coupon_order_relevance` ADD COLUMN `serve_name` varchar(255) NULL DEFAULT NULL COMMENT '服务名称' AFTER `pay_for_order_serve`;
ALTER TABLE `bailun_gogirl`.`coupon_order_relevance` ADD COLUMN `coupon_name` varchar(255) NULL DEFAULT NULL COMMENT '卡券名称' AFTER `serve_name`;
ALTER TABLE `bailun_gogirl`.`coupon_order_relevance` ADD COLUMN `achievement` decimal(11, 2) NULL DEFAULT NULL AFTER `coupon_name`;
ALTER TABLE `bailun_gogirl`.`customer_message` MODIFY COLUMN `id` bigint(20) NOT NULL FIRST;
ALTER TABLE `bailun_gogirl`.`customer_message` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT;
ALTER TABLE `bailun_gogirl`.`features_mapping` ADD INDEX `features_id`(`features_id`) USING BTREE;
ALTER TABLE `bailun_gogirl`.`gogirl_token` ADD COLUMN `technician_id` int(11) NULL DEFAULT NULL COMMENT '美甲师id' AFTER `phone`;
ALTER TABLE `bailun_gogirl`.`gogirl_token` ADD COLUMN `department_id` int(11) NULL DEFAULT NULL COMMENT '店铺id' AFTER `technician_id`;
ALTER TABLE `bailun_gogirl`.`history_order_manage` DROP COLUMN `is_send_comment_msg`;
ALTER TABLE `bailun_gogirl`.`history_order_manage` DROP COLUMN `pay_time`;
ALTER TABLE `bailun_gogirl`.`history_order_serve` DROP COLUMN `service_duration`;
ALTER TABLE `bailun_gogirl`.`mall_product` MODIFY COLUMN `is_bargain_price` int(4) NOT NULL DEFAULT 2 COMMENT '是否开启特价1-是 2-否' AFTER `bargain_price`;
ALTER TABLE `bailun_gogirl`.`message` MODIFY COLUMN `param_json` varchar(2000) NULL DEFAULT NULL AFTER `content`;
ALTER TABLE `bailun_gogirl`.`order_comment` DROP INDEX `order_serve_id`;
ALTER TABLE `bailun_gogirl`.`order_comment` ADD INDEX `order_serve_id`(`order_serve_id`) USING BTREE;
ALTER TABLE `bailun_gogirl`.`order_comment_label` ADD COLUMN `serve_type_id` int(11) NULL DEFAULT NULL COMMENT '标签分类id 0=common' AFTER `update_user`;
ALTER TABLE `bailun_gogirl`.`order_manage` MODIFY COLUMN `is_send_comment_msg` int(11) NOT NULL DEFAULT 0 AFTER `card_amount`;
ALTER TABLE `bailun_gogirl`.`order_serve` DROP COLUMN `leisure_discount_price`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `serve_type_id` int(11) NULL DEFAULT NULL COMMENT '服务分类id' AFTER `leisure_discount_config_id`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `serve_duration` int(11) NULL DEFAULT NULL COMMENT '服务配置时长' AFTER `serve_type_id`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `bind_coupon` int(11) NULL DEFAULT NULL AFTER `service_duration`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `produce_promotion_time_id` int(11) NULL DEFAULT NULL COMMENT '活动配置id' AFTER `bind_coupon`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `promotion_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '活动价格' AFTER `produce_promotion_time_id`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `discount_rate` decimal(11, 2) NULL DEFAULT NULL AFTER `promotion_price`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `leisure_price` decimal(10, 2) NULL DEFAULT NULL AFTER `discount_rate`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `bind_inner_coupon` int(11) NOT NULL DEFAULT 2 AFTER `leisure_price`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `bind_outer_coupon` int(11) NOT NULL DEFAULT 2 AFTER `bind_inner_coupon`;
ALTER TABLE `bailun_gogirl`.`order_serve` ADD COLUMN `bind_times_card` int(11) NOT NULL DEFAULT 2 AFTER `bind_outer_coupon`;
ALTER TABLE `bailun_gogirl`.`over_time_record` MODIFY COLUMN `id` bigint(20) NOT NULL FIRST;
ALTER TABLE `bailun_gogirl`.`over_time_record` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT;
ALTER TABLE `bailun_gogirl`.`over_time_record_log` MODIFY COLUMN `id` bigint(20) NOT NULL FIRST;
ALTER TABLE `bailun_gogirl`.`over_time_record_log` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT;
ALTER TABLE `bailun_gogirl`.`scheduled_manage` ADD INDEX `order_id`(`order_id`) USING BTREE;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `produce_bargain_price` decimal(19, 2) NULL DEFAULT NULL COMMENT '款式原价' AFTER `price`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `produce_current_price` decimal(19, 2) NULL DEFAULT NULL COMMENT '款式现价' AFTER `produce_bargain_price`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `produce_picture_path` varchar(2000) NULL DEFAULT NULL COMMENT '款式图片' AFTER `produce_current_price`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `serve_name` varchar(255) NULL DEFAULT NULL COMMENT '服务名称' AFTER `produce_picture_path`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `serve_picture_path` varchar(2000) NULL DEFAULT NULL COMMENT '服务图片' AFTER `serve_name`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `serve_price` decimal(19, 2) NULL DEFAULT NULL COMMENT '服务价格base_serve.price' AFTER `serve_picture_path`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `serve_type` varchar(255) NULL DEFAULT NULL COMMENT '服务类型' AFTER `serve_price`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `discount_rate` decimal(11, 1) NULL DEFAULT NULL COMMENT '闲时折扣率' AFTER `technician_name`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `actual_start_time` datetime(0) NULL DEFAULT NULL COMMENT '实际开始时间' AFTER `leisure_discount_config_id`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` MODIFY COLUMN `actual_end_time` datetime(0) NULL DEFAULT NULL COMMENT '实际结束时间' AFTER `actual_start_time`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` ADD COLUMN `promotion_price` decimal(10, 2) NULL DEFAULT NULL COMMENT '活动特价' AFTER `status`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` ADD COLUMN `produce_promotion_time_id` int(20) NULL DEFAULT NULL COMMENT '活动id' AFTER `promotion_price`;
ALTER TABLE `bailun_gogirl`.`scheduled_serve` ADD COLUMN `leisure_price` decimal(10, 2) NULL DEFAULT NULL AFTER `produce_promotion_time_id`;
ALTER TABLE `bailun_gogirl`.`store_technician` ADD COLUMN `jobs` varchar(255) NULL DEFAULT NULL COMMENT '岗位职责' AFTER `operate_user_id`;
ALTER TABLE `bailun_gogirl`.`take_leave_event` MODIFY COLUMN `id` bigint(20) NOT NULL FIRST;
ALTER TABLE `bailun_gogirl`.`take_leave_event` MODIFY COLUMN `id` bigint(20) NOT NULL AUTO_INCREMENT;
ALTER TABLE `bailun_gogirl`.`tech_score_rules` MODIFY COLUMN `id` int(11) NOT NULL FIRST;
ALTER TABLE `bailun_gogirl`.`tech_score_rules` ADD PRIMARY KEY (`id`) USING BTREE;
ALTER TABLE `bailun_gogirl`.`tech_score_rules` MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT;
ALTER TABLE `bailun_gogirl`.`times_card_order_serve_detail` ADD COLUMN `order_id` int(11) NULL DEFAULT NULL AFTER `times_card_user_record_id`;
ALTER TABLE `bailun_gogirl`.`times_card_order_serve_detail` ADD COLUMN `achievement` decimal(11, 2) NULL DEFAULT NULL AFTER `order_id`;
ALTER TABLE `bailun_gogirl`.`times_card_used_record` ADD COLUMN `actual_discount_amount` decimal(11, 2) NULL DEFAULT NULL AFTER `technician_name`;
CREATE TABLE `bailun_gogirl`.`color_system_type` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(255) NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
);
CREATE TABLE `bailun_gogirl`.`time_node` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`time_node` time(0) NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
);
CREATE TABLE `bailun_gogirl`.`week_config` (
`id` int(19) NOT NULL AUTO_INCREMENT,
`week` int(11) NULL DEFAULT NULL COMMENT '周几',
`week_date` date NULL DEFAULT NULL COMMENT '这个周几是几号',
`week_str` varchar(255) NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
);
\ No newline at end of file
deploy.sh deleted 100644 → 0
# shellcheck disable=SC2164
cd /gogirl/gogirl-miniapp-backend
git pull
mvn clean package -Dmaven.test.skip=true -Dmaven.compile.fork=true
# shellcheck disable=SC2009
ps -ef | grep miniapp | grep -v grep | awk '{print $2}' | xargs kill -9
nohup java -Xms512m -Xmx2048m -Xss2m -jar -Dspring.profiles.active=pre /gogirl/gogirl-miniapp-backend/target/gogirl-miniapp-backend-0.0.1-SNAPSHOT.jar & \
#docker run -d --name myredis -p 6379:6379 redis --requirepass "blt*nix4321xxuws72%"
nginx.conf.bak deleted 100644 → 0
#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/GogirlWxappMemberApplication.java → src/main/java/com/gogirl/GogirlMiniappApplication.java
......@@ -10,10 +10,10 @@ import org.springframework.web.client.RestTemplate;
@SpringBootApplication
@MapperScan(basePackages = "com.gogirl.infrastructure.mapper")
@EnableAsync
public class GogirlWxappMemberApplication {
public class GogirlMiniappApplication {
public static void main(String[] args) {
SpringApplication.run(GogirlWxappMemberApplication.class, args);
SpringApplication.run(GogirlMiniappApplication.class, args);
}
@Bean
......
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