Pārlūkot izejas kodu

项目内容改进原有MQ实现方式,目前改用Spring事件+异步实现。

xian 5 gadi atpakaļ
vecāks
revīzija
039c693d1d

+ 0 - 3
watero-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTimer.java

@@ -1,18 +1,15 @@
 package com.iamberry.wechat.handles.mq;
 
 import com.iamberry.wechat.core.entity.mq.MQMessage;
-import com.iamberry.wechat.face.mq.MQSerivce;
 import com.iamberry.zk.SpringContextHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.context.event.EventListener;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;

+ 174 - 0
watero-wechat-web/src/main/webapp/common/css/input_order/input_order1.css

@@ -0,0 +1,174 @@
+body{background: #fff;}
+.my_input_list{-webkit-margin-before:0px;-webkit-padding-start:0px;-webkit-margin-after:0px;}
+.my_input_list>li{margin: 13px 0;font-size: 15px;}
+.my_input_list>li input{height:40px;}
+.my_input_list .title{padding: 6px 0 6px 10px;position: relative;}
+.my_input_list .title label{font-size: 18px;}
+.my_input_list .title:before{content: '';position: absolute;width: 3px;height: 50%;top: 25%;left: 0;background: #58d1eb;}
+.btn-water{background: #58d1eb !important;color: #fff;border: 0 !important;}
+.my_input_list .w-75{width: 75% !important;margin-bottom: 0 !important;}
+
+html,
+body {
+    background-color: #fff;
+}
+.mui-views,
+.mui-view,
+.mui-pages,
+.mui-page,
+.mui-page-content {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    width: 100%;
+    height: 100%;
+    background-color: #fff;
+}
+.mui-pages {
+    top: 0;
+    height: auto;
+}
+.mui-scroll-wrapper,
+.mui-scroll {
+    background-color: #fff;
+}
+.mui-page.mui-transitioning {
+    -webkit-transition: -webkit-transform 300ms ease;
+    transition: transform 300ms ease;
+}
+.mui-page-left {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+}
+.mui-ios .mui-page-left {
+    -webkit-transform: translate3d(-20%, 0, 0);
+    transform: translate3d(-20%, 0, 0);
+}
+.mui-navbar {
+    position: fixed;
+    right: 0;
+    left: 0;
+    z-index: 10;
+    height: 44px;
+    background-color: #f7f7f8;
+}
+.mui-navbar .mui-bar {
+    position: absolute;
+    background: transparent;
+    text-align: center;
+}
+.mui-android .mui-navbar-inner.mui-navbar-left {
+    opacity: 0;
+}
+.mui-ios .mui-navbar-left .mui-left,
+.mui-ios .mui-navbar-left .mui-center,
+.mui-ios .mui-navbar-left .mui-right {
+    opacity: 0;
+}
+.mui-navbar .mui-btn-nav {
+    -webkit-transition: none;
+    transition: none;
+    -webkit-transition-duration: .0s;
+    transition-duration: .0s;
+}
+.mui-navbar .mui-bar .mui-title {
+    display: inline-block;
+    width: auto;
+}
+.mui-page-shadow {
+    position: absolute;
+    right: 100%;
+    top: 0;
+    width: 16px;
+    height: 100%;
+    z-index: -1;
+    content: '';
+}
+.mui-page-shadow {
+    background: -webkit-linear-gradient(left, rgba(0, 0, 0, 0) 0, rgba(0, 0, 0, 0) 10%, rgba(0, 0, 0, .01) 50%, rgba(0, 0, 0, .2) 100%);
+    background: linear-gradient(to right, rgba(0, 0, 0, 0) 0, rgba(0, 0, 0, 0) 10%, rgba(0, 0, 0, .01) 50%, rgba(0, 0, 0, .2) 100%);
+}
+.mui-navbar-inner.mui-transitioning,
+.mui-navbar-inner .mui-transitioning {
+    -webkit-transition: opacity 300ms ease, -webkit-transform 300ms ease;
+    transition: opacity 300ms ease, transform 300ms ease;
+}
+.mui-page {
+    display: none;
+}
+.mui-pages .mui-page {
+    display: block;
+}
+.mui-page .mui-table-view:first-child {
+    margin-top: 15px;
+}
+.mui-page .mui-table-view:last-child {
+    margin-bottom: 30px;
+}
+.mui-table-view {
+    margin-top: 20px;
+}
+
+.mui-table-view span.mui-pull-right {
+    color: #999;
+}
+.mui-table-view-divider {
+    background-color: #efeff4;
+    font-size: 14px;
+}
+.mui-table-view-divider:before,
+.mui-table-view-divider:after {
+    height: 0;
+}
+.head {
+    height: 40px;
+}
+#head {
+    line-height: 40px;
+}
+.head-img {
+    width: 40px;
+    height: 40px;
+}
+#head-img1 {
+    position: absolute;
+    bottom: 10px;
+    right: 40px;
+    width: 40px;
+    height: 40px;
+}
+.update {
+    font-style: normal;
+    color: #999999;
+    margin-right: -25px;
+    font-size: 15px
+}
+.mui-fullscreen {
+    position: fixed;
+    z-index: 20;
+    background-color: #000;
+}
+.mui-ios .mui-navbar .mui-bar .mui-title {
+    position: static;
+}
+/*问题反馈在setting页面单独的css*/
+#feedback .mui-popover{
+    position: fixed;
+}
+#feedback .mui-table-view:last-child {
+    margin-bottom: 0px;
+}
+#feedback .mui-table-view:first-child {
+    margin-top: 0px;
+}
+/*问题反馈在setting页面单独的css==end*/
+
+.mui-checkbox.mui-left label, .mui-radio.mui-left label{padding-top: 8px;padding-right: 0;  padding-left:42px;}
+.mui-checkbox.mui-left input[type=checkbox], .mui-radio.mui-left input[type=radio] {
+    left: 10px;
+}
+.mui-input-group:before,.mui-input-group:after,.mui-input-group .mui-input-row:after{display: none;}
+.mui-checkbox input[type=checkbox]:checked:before, .mui-radio input[type=radio]:checked:before{color: #58d1eb;}
+.mui-input-group .w-40{display: inline-block;width: 48%;}

+ 24 - 0
watero-wechat-web/src/main/webapp/common/css/login/login.css

@@ -0,0 +1,24 @@
+.loginWraper{background: #fff url(../../images/login/admin-login-bg.jpg) no-repeat top;}
+.loginBox{padding-top: 88px;background: url(../../images/login/admin-loginform-bg.png) top right no-repeat;background-size:90% 80%;padding-bottom: 100px;}
+.input-text, .textarea {border: 0;border-bottom: solid 1px #ddd;text-indent: 2em;}
+.user_count{background: url(../../images/login/ipt_head.png) left center no-repeat /30px !important;}
+.pass_word{background: url(../../images/login/ipt_suo.png) left center no-repeat /30px !important;}
+.validate{background: url(../../images/login/ipt_img.png) left center no-repeat /30px !important;width:210px !important;}
+.loginbox_btn{margin-top: 15px !important;}
+.my-btn-login{width: 90% !important;}
+@media screen and (orientation:portrait) and (-webkit-min-device-pixel-ratio:2){
+/*mobile竖屏*/
+.loginWraper {background: #fff url(../../images/login/admin-login-bg.jpg) no-repeat top right;background-size: auto 50%;}
+.loginBox {padding-top: 58px;background: url(../../images/login/admin-loginform-bg.png) top center no-repeat;background-size: 58% 78%;padding-bottom: 31px;}
+.input-text, .textarea {text-indent: 2em;}
+.validate{background: none !important;text-indent: 0; width: 160px !important;}
+.my-btn-login{width: 75% !important;}
+.loginbox_btn{margin-top: 60px !important;}
+ .loginWraper{overflow-x: hidden;}
+}
+ @media screen and (orientation:landscape) and (-webkit-min-device-pixel-ratio:2){
+/*mobile横屏*/
+.loginWraper {background: #fff url(../../images/login/admin-login-bg.jpg) no-repeat top right;background-size: 100% auto;}
+.loginBox{padding-top: 88px;background: url(../../images/login/admin-loginform-bg.png) top center no-repeat;background-size:90% 80%;padding-bottom: 50px;}
+.my-btn-login{width:80% !important;}
+}

+ 27 - 0
watero-wechat-web/src/main/webapp/common/css/mobile-index.css

@@ -0,0 +1,27 @@
+html{min-height: 100%;}
+body{background: url(../images/mobile_index_bg.jpg) center center no-repeat;background-size: 100% 100%;min-height: 100%;height: 100%;}
+.index-menu{position: fixed;top: 50%;left: 50%;width: 280px;height: 280px;background: #fff;margin: -180px 0 0 -140px;border-radius: 50%;border: 4px solid #58d1eb;}
+.index-menu:before{content: '';position: absolute;left: 50%;top: 0;width: 4px;height: 272px;background: #58d1eb;margin-left: -2px;}
+.index-menu:after{content: '';position: absolute;left: 0;top: 50%;width: 272px;height: 4px;background: #58d1eb;margin-top: -2px;}
+.menu-box{position: relative;height: 100%;}
+.menu-1{position: absolute;left: 20%;top: 22%;width: 60px;height: 60px;}
+.menu-1:before{content: '\e699';font-size: 40px;position: absolute;top: 0;left: 0;text-align: center;width: 100%;color: #ddd;}
+.menu-1.active:before{color: #58d1eb;}
+.menu-1:after{content: '录入订单';font-size: 14px;text-align: center;position: absolute;bottom: 0;left: 0;color: #ddd;}
+.menu-1.active:after{color: #999;}
+.menu-2{position: absolute;right: 20%;top: 22%;width: 60px;height: 60px;}
+.menu-2:before{content: '\e698';font-size: 44px;position: absolute;top: 0;right: 0;text-align: center;width: 100%;color: #ddd;}
+.menu-2.active:before{color: #58d1eb;}
+.menu-2:after{content: '我的订单';font-size: 14px;text-align: center;position: absolute;bottom: 0;left: 0;color: #ddd;}
+.menu-2.active:after{color: #999;}
+.menu-3{position: absolute;left: 20%;bottom: 16%;width: 60px;height: 60px;}
+.menu-3:before{content: '\e69e';font-size: 40px;position: absolute;top: 0;left: 0;text-align: center;width: 100%;color: #ddd;}
+.menu-3.active:before{color: #58d1eb;}
+.menu-3:after{content: '财务审核';font-size: 14px;text-align: center;position: absolute;bottom: 0;left: 0;color: #ddd;}
+.menu-3.active:after{color: #999;}
+.menu-4{position: absolute;right: 20%;bottom: 16%;width: 60px;height: 60px;}
+.menu-4:before{content: '\e697';font-size: 40px;position: absolute;top: 0;left: 0;text-align: center;width: 100%;color: #ddd;}
+.menu-4.active:before{color: #58d1eb;}
+.menu-4:after{content: '审核订单';font-size: 14px;text-align: center;position: absolute;bottom: 0;left: 0;color: #ddd;}
+.menu-4.active:after{color: #999;}
+.index-footer{position: absolute;width: 100%;left: 0;bottom: 20px;height: 30px;color: #fff;text-align: center;}

+ 4 - 0
watero-wechat-web/src/main/webapp/common/css/style.css

@@ -0,0 +1,4 @@
+@charset "utf-8";
+/* 你自己的样式 */
+.loading-bg{width: 100%;min-width:100%;height: 100%;min-height:100%; background-color:#F0F0F0;position: fixed;left: 0;top: 0;z-index: 999;}
+.loading-bg .mui-loading{margin-top: 50%;text-align: center;color: #aaa;}