Revert "JSON序列化考虑Lazy Fetch"

This reverts commit a4651aa4cf197f1974ec2f885a93a65c84bf6a8d.

pom.xml

@@ -9,6 +9,7 @@
 		<groupId>com.uas.platform</groupId>
 		<artifactId>platform</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../platform</relativePath>
 	</parent>
 	<profiles>
 		<profile>
@@ -349,10 +350,12 @@
 					</execution>
 				</executions>
 				<configuration>
-					<format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
-					<items>
-						<item>timestamp</item>
-					</items>
+					<configuration>
+						<format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
+						<items>
+							<item>timestamp</item>
+						</items>
+					</configuration>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -446,7 +449,7 @@
 								<sourceInclude>resources/tpl/**/*.html</sourceInclude>
 								<sourceInclude>WEB-INF/views/**/*.html</sourceInclude>
 							</sourceIncludes>
-							<!--http://static.ubtob.com/css/index.css?_v=1450321871828-->
+							http://static.ubtob.com/css/index.css?_v=1450321871828
 							<versionSuffix>
 								<suffix>?_v=${timestamp}</suffix>
 								<exclude>*/require.js,*.min.js,*.min.css</exclude>
@@ -478,12 +481,9 @@
 				<artifactId>tomcat7-maven-plugin</artifactId>
 				<version>2.2</version>
 				<configuration>
-					<port>80</port>
-					<path>/</path>
+					<port>8090</port>
+					<path>/platform-b2b</path>
 					<uriEncoding>utf-8</uriEncoding>
-					<systemProperties>
-						<log4j.configuration>classpath:log4j.properties</log4j.configuration>
-					</systemProperties>
 				</configuration>
 			</plugin>
 		</plugins>

src/main/java/com/uas/platform/b2b/core/serializer/LazyPropertyFilter.java

@@ -1,35 +0,0 @@
-package com.uas.platform.b2b.core.serializer;
-
-import com.alibaba.fastjson.serializer.PropertyFilter;
-import org.hibernate.collection.spi.PersistentCollection;
-import org.hibernate.proxy.HibernateProxy;
-import org.hibernate.proxy.LazyInitializer;
-
-/**
- * Created by Pro1 on 2017/11/13.
- *
- * 过滤FetchType.LAZY的属性，不进行序列化
- */
-public class LazyPropertyFilter implements PropertyFilter{
-
-    @Override
-    public boolean apply(Object object, String name, Object value) {
-        // hibernate FetchType.LAZY代理对象
-        if (value instanceof HibernateProxy) {
-            LazyInitializer initializer = ((HibernateProxy) value).getHibernateLazyInitializer();
-            if (initializer.isUninitialized()) {
-                return false;
-            }
-        } else if (value instanceof PersistentCollection) {// 实体关联集合一对多等
-            PersistentCollection collection = (PersistentCollection) value;
-            if (!collection.wasInitialized()) {
-                return false;
-            }
-            Object val = collection.getValue();
-            if (val == null) {
-                return false;
-            }
-        }
-        return true;
-    }
-}

src/main/java/com/uas/platform/b2b/dao/PurchaseAcceptDao.java

@@ -31,6 +31,7 @@ public interface PurchaseAcceptDao extends JpaSpecificationExecutor<PurchaseAcce
 	/**
 	 * 按卖家UU、反过账状态查找
 	 * @param vendUU
+	 * @param sendStatus
 	 * @param nonPosting
 	 * @return
 	 */

src/main/resources/dev/dubbo.properties

@@ -1,3 +1,3 @@
 zk.url=zookeeper://10.10.100.11:2181
-dubbo.owner=test
-dubbo.group=test
+dubbo.owner=dev
+dubbo.group=dev

src/main/resources/spring/context.xml

@@ -148,7 +148,7 @@
 			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
 				<property name="generateDdl" value="false" />
 				<property name="databasePlatform" value="org.hibernate.dialect.Oracle10gDialect" />
-				<property name="showSql" value="true" />
+				<property name="showSql" value="false" />
 			</bean>
 		</property>
 		<property name="jpaDialect">

src/main/webapp/WEB-INF/spring/webmvc.xml

@@ -7,21 +7,6 @@
 	<!-- 开启@AspectJ AOP代理 -->
 	<aop:aspectj-autoproxy />
 
-	<bean id="lazyPropertyFilter" class="com.uas.platform.b2b.core.serializer.LazyPropertyFilter"></bean>
-
-	<bean id="fastJsonConfig" class="com.alibaba.fastjson.support.config.FastJsonConfig">
-		<property name="serializerFeatures">
-			<list>
-				<value>DisableCircularReferenceDetect</value>
-			</list>
-		</property>
-		<property name="serializeFilters">
-			<list>
-				<ref bean="lazyPropertyFilter"/>
-			</list>
-		</property>
-	</bean>
-
 	<mvc:annotation-driven>
 		<mvc:message-converters register-defaults="true">
 			<!-- 避免IE执行AJAX时,返回JSON出现下载文件 -->
@@ -32,7 +17,11 @@
 						<value>application/json;charset=UTF-8</value>
 					</list>
 				</property>
-				<property name="fastJsonConfig" ref="fastJsonConfig" />
+				<property name="features">
+					<list>
+						<value>DisableCircularReferenceDetect</value>
+					</list>
+				</property>
 			</bean>
 		</mvc:message-converters>
 	</mvc:annotation-driven>

src/main/webapp/resources/lib/angular/angular.js

@@ -17948,7 +17948,7 @@ var htmlAnchorDirective = valueFn({
         <input type="text" ng-readonly="checked" value="I'm Angular"/>
       </file>
       <file name="protractor.js" type="protractor">
-        it(view, function() {
+        it('should toggle readonly attr', function() {
           expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeFalsy();
           element(by.model('checked')).click();
           expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeTruthy();

src/main/webapp/resources/lib/angular/ui-bootstrap-tpls.js

@@ -4805,11 +4805,11 @@ angular.module("template/timepicker/timepicker.html", []).run(["$templateCache",
     "		</tr>\n" +
     "		<tr>\n" +
     "			<td class=\"form-group\" ng-class=\"{'has-error': invalidHours}\">\n" +
-    "				<input style=\"width:50px;\" type=\"text\" ng-model=\"hours\" ng-change=\"updateHours()\" class=\"form-control text-center\" ng-view=\"readonlyInput\" maxlength=\"2\">\n" +
+    "				<input style=\"width:50px;\" type=\"text\" ng-model=\"hours\" ng-change=\"updateHours()\" class=\"form-control text-center\" ng-readonly=\"readonlyInput\" maxlength=\"2\">\n" +
     "			</td>\n" +
     "			<td>:</td>\n" +
     "			<td class=\"form-group\" ng-class=\"{'has-error': invalidMinutes}\">\n" +
-    "				<input style=\"width:50px;\" type=\"text\" ng-model=\"minutes\" ng-change=\"updateMinutes()\" class=\"form-control text-center\" ng-view=\"readonlyInput\" maxlength=\"2\">\n" +
+    "				<input style=\"width:50px;\" type=\"text\" ng-model=\"minutes\" ng-change=\"updateMinutes()\" class=\"form-control text-center\" ng-readonly=\"readonlyInput\" maxlength=\"2\">\n" +
     "			</td>\n" +
     "			<td ng-show=\"showMeridian\"><button type=\"button\" class=\"btn btn-default text-center\" ng-click=\"toggleMeridian()\">{{meridian}}</button></td>\n" +
     "		</tr>\n" +

src/main/webapp/resources/tpl/index/purc/cart_detail.html

@@ -149,7 +149,7 @@
 									</select>
 								</span>
 							<span class="fl" required="required" ng-if="order.currency != 'RMB'"> <input
-									class="text select02 wid100" value="0" view>
+									class="text select02 wid100" value="0" readonly>
 								</span>
 						</div>
 					</li>-->

src/main/webapp/resources/tpl/index/purc/deputyOrder_detail.html

@@ -202,7 +202,7 @@
                         <li>
                             <div class="fl">
                                 <em><b>*</b>终端供应商名称：</em>
-                                <span><!-- <input type="text" class="input01" ng-model="deOrder.tervendor" ng-view="!deOrder.$editing"> -->
+                                <span><!-- <input type="text" class="input01" ng-model="deOrder.tervendor" ng-readonly="!deOrder.$editing"> -->
                                 	 <input  ng-model="deOrder.tervendor" list="hisvendors" class="select" style="width: 200px">
 	                                    <datalist id="hisvendors">
 	                                    	 <option  ng-repeat="vendor in hisvendors" value="{{vendor.vendorname}}">{{vendor.vendorname}}</option>

src/main/webapp/resources/tpl/index/purc/inquiry_new.html

@@ -1128,7 +1128,7 @@ select.disabled {
                         <div class="info-line col-xs-4"><span>供应商</span><span><input class="tender-input01" ng-model="vendor.enName" type="text" readonly></span></div>
                         <!-- <div class="col-xs-1" style="width: 60px; margin-left: 20px;">UU</div>
                         <div class="col-xs-3">
-                            <input ng-model="vendor.enuu" type="text" style="width: 200px;" class="tender-input01" view>
+                            <input ng-model="vendor.enuu" type="text" style="width: 200px;" class="tender-input01" readonly>
                         </div> -->
                         <div class="info-line col-xs-3">
                             <span>币别</span>

src/main/webapp/resources/tpl/index/purc/newProdInfo.html

@@ -130,11 +130,11 @@
                 </dd>
                 &lt;!&ndash;  <dd>
                     <div class="fl">原厂型号：</div>
-                    <div class="fr"><input type="text" view="view" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode"  ng-click="selectKind()"><span>（关联器件原厂型号，不可编辑）</span></div>
+                    <div class="fr"><input type="text" readonly="readonly" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode"  ng-click="selectKind()"><span>（关联器件原厂型号，不可编辑）</span></div>
                 </dd> &ndash;&gt;
                 <dd>
                     <div class="fl">品牌：</div>
-                    <div class="fr"><input type="text" ng-model="prodInfo.brand" placeholder="品牌" style="cursor: pointer;" view="view"><span>（关联器件物料品牌，不可编辑）</span></div>
+                    <div class="fr"><input type="text" ng-model="prodInfo.brand" placeholder="品牌" style="cursor: pointer;" readonly="readonly"><span>（关联器件物料品牌，不可编辑）</span></div>
                 </dd>
                 <dd>
                     <div class="fl">单位：</div>

src/main/webapp/resources/tpl/index/purc/purcinquiry_new.html

@@ -1106,7 +1106,7 @@ select.disabled {
                         <div class="info-line col-xs-4"><span>供应商</span><span><input class="tender-input01" ng-model="vendor.enName" type="text" readonly></span></div>
                         <!-- <div class="col-xs-1" style="width: 60px; margin-left: 20px;">UU</div>
                         <div class="col-xs-3">
-                            <input ng-model="vendor.uu" type="text" style="width: 200px;" class="tender-input01" view>
+                            <input ng-model="vendor.uu" type="text" style="width: 200px;" class="tender-input01" readonly>
                         </div> -->
                         <div class="info-line col-xs-3">
                             <span>币别</span>

src/main/webapp/resources/tpl/index/purc/saved_tender.html

@@ -971,7 +971,7 @@
                         <div class="col-xs-2 control-label" style="width: 100px;">供应商{{$index + 1}}</div>
                         <!--<div for="uu{{$index + 1}}" class="col-xs-1" style="width: 20px;">UU</div>-->
                         <!--<div class="col-xs-2">-->
-                        <!--<input class="tender-input01" ng-model="en.uu" type="number" id="uu{{$index + 1}}" view ng-required="tender.ifOpen == 0">-->
+                        <!--<input class="tender-input01" ng-model="en.uu" type="number" id="uu{{$index + 1}}" readonly ng-required="tender.ifOpen == 0">-->
                         <!--</div>-->
                         <div for="enName{{$index + 1}}" style="width: 40px; float: left;">名称:</div>
                         <div class="col-xs-3">

src/main/webapp/resources/tpl/index/purc/tender.html

@@ -988,7 +988,7 @@ input[type="radio"], input[type="checkbox"] {
                         <div class="col-xs-2 control-label" style="width: 100px;">供应商{{$index + 1}}</div>
                         <!--<div for="uu{{$index + 1}}" class="col-xs-1" style="width: 20px;">UU</div>-->
                         <!--<div class="col-xs-2">-->
-                            <!--<input class="tender-input01" ng-model="en.uu" type="number" id="uu{{$index + 1}}" view ng-required="tender.ifOpen == 0">-->
+                            <!--<input class="tender-input01" ng-model="en.uu" type="number" id="uu{{$index + 1}}" readonly ng-required="tender.ifOpen == 0">-->
                         <!--</div>-->
                         <div for="enName{{$index + 1}}" style="width: 40px; float: left;">名称:</div>
                         <div class="col-xs-3">

src/main/webapp/resources/tpl/index/purc/tenderlist.html

@@ -294,7 +294,7 @@
                         </div>
                         <div class="input-group input-group-xs input-trigger">
                             <input type="text" ng-model="condition.dateFrom"
-                                   class="form-control" placeholder="点击选择起始日期" view="view"
+                                   class="form-control" placeholder="点击选择起始日期" readonly="readonly"
                                    datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
                                    ng-required="true" max-date="condition.dateTo" current-text="今天"
                                    clear-text="清除" close-text="关闭"
@@ -310,7 +310,7 @@
                         </div>
                         <div class="input-group input-group-xs input-trigger">
                             <input type="text" ng-model="condition.dateTo"
-                                   class="form-control" placeholder="点击选择截止日期" view="view"
+                                   class="form-control" placeholder="点击选择截止日期" readonly="readonly"
                                    datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
                                    ng-required="true" min-date="condition.dateFrom"
                                    current-text="今天" clear-text="清除" close-text="关闭"

src/main/webapp/resources/tpl/index/sale/inquiry_detail.html

@@ -483,7 +483,7 @@
 						<!--</td>-->
 						<!--<td class="text-center" ng-bind="::inquiryItem.currency" width="50"></td>-->
 						<!--<td class="text-center" width="60">-->
-						<!--<input type="text" ng-pattern="/^\+?[1-9]\d*$/" ng-model="inquiryItem.taxrate" style="width: 25px" ng-view="!inquiryItem.$editing">%</td>-->
+						<!--<input type="text" ng-pattern="/^\+?[1-9]\d*$/" ng-model="inquiryItem.taxrate" style="width: 25px" ng-readonly="!inquiryItem.$editing">%</td>-->
 						<!--<td class="text-center" width="85">-->
 							<!--<div ng-show="!inquiryItem.$editing">-->
 								<!--<span ng-bind="inquiryItem.minOrderQty"></span> <span-->

src/main/webapp/resources/tpl/index/sale/open_tender_detail.html

@@ -461,11 +461,11 @@
                         <div class="col-xs-2 control-label" style="width: 100px;">供应商{{$index + 1}}</div>
                         <div for="uu{{$index + 1}}" class="col-xs-1" style="width: 20px;">UU</div>
                         <div class="col-xs-2">
-                            <input class="tender-input" ng-model="en.uu" type="number" id="uu{{$index + 1}}" view ng-required="tender.ifOpen == 0">
+                            <input class="tender-input" ng-model="en.uu" type="number" id="uu{{$index + 1}}" readonly ng-required="tender.ifOpen == 0">
                         </div>
                         <div for="enName{{$index + 1}}" class="col-xs-1" style="width: 60px; margin-left: 20px; margin-right: -20px;">名称</div>
                         <div class="col-xs-3">
-                            <input ng-model="en.enName" type="text" style="width: 100%;" class="tender-input" view id="enName{{$index + 1}}"
+                            <input ng-model="en.enName" type="text" style="width: 100%;" class="tender-input" readonly id="enName{{$index + 1}}"
                                    ng-required="tender.ifOpen == 0">
                         </div>
                         <div class="col-xs-1">

src/main/webapp/resources/tpl/index/sale/open_tender_list.html

@@ -315,7 +315,7 @@
                         <span class="tender-desc f14" style="padding-top: 15px;">投标截止时间:</span>
                         <div class="input-group input-trigger date-picker">
                             <input type="text" ng-model="tender.endDate" required
-                                   class="form-control" placeholder="点击选择截止日期" view="view"
+                                   class="form-control" placeholder="点击选择截止日期" readonly="readonly"
                                    datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
                                    ng-required="true" max-date="tender.publishDate" current-text="今天" min-date = "currentDay()"
                                    clear-text="清除" close-text="关闭"
@@ -334,7 +334,7 @@
                         <span class="tender-desc f14" style="padding-top: 15px;">公布结果时间:</span>
                         <div class="input-group input-trigger date-picker">
                             <input type="text" ng-model="tender.publishDate" required
-                                   class="form-control" placeholder="点击选择公布日期" view="view"
+                                   class="form-control" placeholder="点击选择公布日期" readonly="readonly"
                                    datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
                                    ng-required="true" min-date="getMinDate()"
                                    current-text="今天" clear-text="清除" close-text="关闭"
@@ -442,11 +442,11 @@
                         <div class="col-xs-2 control-label" style="width: 100px;">供应商{{$index + 1}}</div>
                         <div for="uu{{$index + 1}}" class="col-xs-1" style="width: 20px;">UU</div>
                         <div class="col-xs-2">
-                            <input class="tender-input01" ng-model="en.uu" type="number" id="uu{{$index + 1}}" view ng-required="tender.ifOpen == 0">
+                            <input class="tender-input01" ng-model="en.uu" type="number" id="uu{{$index + 1}}" readonly ng-required="tender.ifOpen == 0">
                         </div>
                         <div for="enName{{$index + 1}}" class="col-xs-1" style="width: 60px; margin-left: 20px; margin-right: -20px;">名称</div>
                         <div class="col-xs-3">
-                            <input ng-model="en.enName" type="text" style="width: 100%;" class="tender-input01" view id="enName{{$index + 1}}"
+                            <input ng-model="en.enName" type="text" style="width: 100%;" class="tender-input01" readonly id="enName{{$index + 1}}"
                                    ng-required="tender.ifOpen == 0">
                         </div>
                         <div class="col-xs-1">

src/main/webapp/resources/tpl/index/sale/opentenderlist.html

@@ -209,7 +209,7 @@
                         </div>
                         <div class="input-group input-group-xs input-trigger">
                             <input type="text" ng-model="condition.dateFrom"
-                                   class="form-control" placeholder="点击选择起始日期" view="view"
+                                   class="form-control" placeholder="点击选择起始日期" readonly="readonly"
                                    datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
                                    ng-required="true" max-date="condition.dateTo" current-text="今天"
                                    clear-text="清除" close-text="关闭"
@@ -225,7 +225,7 @@
                         </div>
                         <div class="input-group input-group-xs input-trigger">
                             <input type="text" ng-model="condition.dateTo"
-                                   class="form-control" placeholder="点击选择截止日期" view="view"
+                                   class="form-control" placeholder="点击选择截止日期" readonly="readonly"
                                    datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
                                    ng-required="true" min-date="condition.dateFrom"
                                    current-text="今天" clear-text="清除" close-text="关闭"