Merge remote-tracking branch 'origin/dev' into feature-201844-wangcz

src/main/java/com/uas/platform/b2c/advertise/news/service/impl/NewsServiceImpl.java

@@ -49,10 +49,9 @@ public class NewsServiceImpl implements NewsService {
 
 	@Override
 	public JSONObject getNewsListByPage(int page, int pageSize) {
-//		if (page <= 0) page = 1;
-//		String url = conf.getRequestUrlForNews( "/news/created/v2?pagenumber=" + page +"&pagesize=" + pageSize + "&taxonomySlug=B2C");
-//		return getDataFromRedisByUrl(url);
-		return new JSONObject();
+		if (page <= 0) page = 1;
+		String url = conf.getRequestUrlForNews( "/news/created/v2?pagenumber=" + page +"&pagesize=" + pageSize + "&taxonomySlug=B2C");
+		return getDataFromRedisByUrl(url);
 	}
 
 	@Override

src/main/java/com/uas/platform/b2c/common/account/model/ErpB2cLog.java

@@ -35,7 +35,7 @@ public class ErpB2cLog extends BufferedLogable implements Serializable {
 	private Long enUU;
 
 	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "log_useruu", insertable = false, updatable = false)
+	@JoinColumn(name = "log_useruu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "null",value = ConstraintMode.NO_CONSTRAINT))
 	private UserBaseInfo user;
 
 	@NotNull

src/main/java/com/uas/platform/b2c/common/account/model/UsageLog.java

@@ -6,15 +6,7 @@ import com.uas.platform.core.logging.BufferedLogable;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.springframework.util.StringUtils;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.*;
 
 /**
@@ -41,7 +33,7 @@ public class UsageLog extends BufferedLogable implements Serializable {
 	private Long enUU;
 
 	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "log_useruu", insertable = false, updatable = false)
+	@JoinColumn(name = "log_useruu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none",value = ConstraintMode.NO_CONSTRAINT))
 	private UserBaseInfo user;
 
 	@Column(name = "log_useruu")

src/main/java/com/uas/platform/b2c/prod/commodity/model/ProductMatchResult.java

@@ -36,7 +36,7 @@ public class ProductMatchResult implements Serializable {
 	 * 产品
 	 */
 	@ManyToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pr_prid", insertable = false, updatable = false)
+	@JoinColumn(name = "pr_prid", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
 	private Product product;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/commodity/model/V_ProductPerson.java

@@ -205,12 +205,6 @@ public class V_ProductPerson implements Serializable{
     @Column(name = "pr_matchsize")
     private Integer matchsize;
 
-    /**
-     * 匹配结果
-     */
-    @OneToMany(mappedBy = "product", cascade = { CascadeType.REFRESH }, fetch = FetchType.EAGER)
-    private Set<ProductMatchResult> matchresults;
-
     /**
      * 封装
      */
@@ -523,14 +517,6 @@ public class V_ProductPerson implements Serializable{
         this.matchsize = matchsize;
     }
 
-    public Set<ProductMatchResult> getMatchresults() {
-        return matchresults;
-    }
-
-    public void setMatchresults(Set<ProductMatchResult> matchresults) {
-        this.matchresults = matchresults;
-    }
-
     public String getEncapsulation() {
         return encapsulation;
     }

src/main/java/com/uas/platform/b2c/prod/commodity/model/V_ProductPrivate.java

@@ -202,12 +202,6 @@ public class V_ProductPrivate implements Serializable {
     @Column(name = "pr_matchsize")
     private Integer matchsize;
 
-    /**
-     * 匹配结果
-     */
-    @OneToMany(mappedBy = "product", cascade = { CascadeType.REFRESH }, fetch = FetchType.EAGER)
-    private Set<ProductMatchResult> matchresults;
-
     /**
      * 封装
      */
@@ -545,14 +539,6 @@ public class V_ProductPrivate implements Serializable {
         this.matchsize = matchsize;
     }
 
-    public Set<ProductMatchResult> getMatchresults() {
-        return matchresults;
-    }
-
-    public void setMatchresults(Set<ProductMatchResult> matchresults) {
-        this.matchresults = matchresults;
-    }
-
     public String getEncapsulation() {
         return encapsulation;
     }

src/main/java/com/uas/platform/b2c/prod/product/component/modal/ComponentGoods.java

@@ -112,14 +112,14 @@ public class ComponentGoods implements Serializable {
 	 * 器件的品牌
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "cmp_brid", insertable = false, updatable = false)
+	@JoinColumn(name = "cmp_brid", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
 	private BrandInfo brand;
 
 	/**
 	 * 器件的分类
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "cmp_kiid", insertable = false, updatable = false)
+	@JoinColumn(name = "cmp_kiid", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
 	private KindInfo kind;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/property/model/PropertyValue.java

@@ -37,7 +37,7 @@ public class PropertyValue {
 	 * 属性
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pv_propertyid", insertable = false, updatable = false)
+	@JoinColumn(name = "pv_propertyid", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "null",value = ConstraintMode.NO_CONSTRAINT))
 	private Property property;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/store/model/StoreIn.java

@@ -176,6 +176,7 @@ public class StoreIn implements Serializable {
 	 */
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, targetEntity = Qualification.class)
 	@JoinColumn(name = "qu_store_id")
+	@org.hibernate.annotations.ForeignKey(name = "none")
 	private Set<Qualification> qualifications = new HashSet<>();
 
 	/**

src/main/java/com/uas/platform/b2c/trade/seek/model/SeekPurchaseGoods.java

@@ -3,14 +3,7 @@ package com.uas.platform.b2c.trade.seek.model;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.User;
 import java.util.Date;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 
 /**
  * 求购与产品关联，是否有现货判断
@@ -44,7 +37,7 @@ public class SeekPurchaseGoods {
      * 求购详细信息
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "sp_uu", insertable = false, updatable = false)
+    @JoinColumn(name = "sp_uu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
     private User user;
 
     /**
@@ -57,7 +50,7 @@ public class SeekPurchaseGoods {
      * 企业的详细信息
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "sp_enUu", insertable = false, updatable = false)
+    @JoinColumn(name = "sp_enUu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
     private Enterprise enterprise;
 
     /**

src/main/java/com/uas/platform/b2c/trade/seek/model/SeekPurchaseOfferGoods.java

@@ -5,15 +5,7 @@ import com.uas.platform.b2c.common.account.model.User;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import javax.swing.plaf.basic.BasicInternalFrameTitlePane.SystemMenuBar;
 
 /**
@@ -88,7 +80,7 @@ public class SeekPurchaseOfferGoods {
      * 买家求购的详细信息
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "sp_en_uu", insertable = false, updatable = false)
+    @JoinColumn(name = "sp_en_uu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
     private Enterprise enterprise;
 
     /**
@@ -113,7 +105,7 @@ public class SeekPurchaseOfferGoods {
      * 用户详细信息
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "sp_uu", insertable = false, updatable = false)
+    @JoinColumn(name = "sp_uu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
     private User user;
 
     /**

src/main/java/com/uas/platform/b2c/trade/seek/model/SeekPurchasePushGoods.java

@@ -3,14 +3,7 @@ package com.uas.platform.b2c.trade.seek.model;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.User;
 import java.util.Date;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 
 /**
  * 推送给卖家的求购信息
@@ -38,7 +31,7 @@ public class SeekPurchasePushGoods {
      * 求购详细信息
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "sp_uu", insertable = false, updatable = false)
+    @JoinColumn(name = "sp_uu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
     private User user;
 
     /**
@@ -51,7 +44,7 @@ public class SeekPurchasePushGoods {
      * 企业的详细信息
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "sp_enUu", insertable = false, updatable = false)
+    @JoinColumn(name = "sp_enUu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
     private Enterprise enterprise;
 
     /**

src/main/java/com/uas/platform/b2c/trade/seek/model/SeekSalesmanInfo.java

@@ -32,11 +32,11 @@ public class SeekSalesmanInfo {
     private Date publicDate;
 
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "id_useruu", insertable = false, updatable = false)
+    @JoinColumn(name = "id_useruu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
     private User user;
 
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "in_enuu", insertable = false, updatable = false)
+    @JoinColumn(name = "in_enuu", insertable = false, updatable = false, foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))
     private Enterprise enterprise;
 
     @Column(name = "id_cmpcode")

src/main/resources/dev/account.properties

@@ -19,7 +19,7 @@ sso.updateQuestion.url=http://188.131.128.107:3000/encrypted-setting/EncryptedSe
 sso.realNameAuth.url=http://188.131.128.107:3000/certification/realNameCertification
 #cross domain
 sso.ask.url=http://188.131.128.107:3000/sso/login/ask
-sso.askout.url=http://188.131.128.107:24004/sso/logout/ask
+sso.askout.url=http://188.131.128.107:3000/sso/logout/ask
 
 sso.authcookie.secretkey=Z318866alN6gA0piuO
 sso.client.private_key=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAIquTH9rOygR1iyMzU1CSQDXG+lJpMQgWkRWMwO3lzS+UJ3GRq1yxxD8mPFZCuItMRxP4Mvu3nvxDvsJx8lfRXk4MGswROIBPcdBAnasphN7wS5mDvDe/VBIKv+fg4j4VEnak9VUAQhS1gDtp+ZmQpCc9/gz8vueF1ueIXspAoUhAgMBAAECgYBfMP8PY1KK0Zt6nvd5NauYqQ7elg9EFJUBXU3NGmLu8Eez1NrEygk8braoy57921lffrDmKsOKvc+zn2YEoqGzbHCOuYsTDBXFCGLkj8oPeHyrs02+XuJe9j2ejhq2N04oP/TMxerFeyWnHdRCNXECrthqhwTRmGitnj2/+FLVAQJBAM93HY/5HoFlfRv9zjFy72ft/ZC60jHERXwyumbFs8z/x8sHCY1GWfgGhm1ShE1bDWAPY3W9WCFsx6nOETsHajECQQCrH8Dl7IIIHJ5D0TDisFkePnYELxpmOGlPwPOQ7hyLAdW4aB1fVIpjsWmgGOyPvmhK+b99XeLUbwpxVU7AAB3xAkAJNxJCFd+sAbUH7EMfYSqPJDwSFKpHeZ9Yf+xVqkxtO6NFOl/LPae7Y5bO/k5QHU4/yQ8y6KEkgu9vdG7Bf3fRAkEAiDlX6vDytphpmN0PyHXQC9Z3Rm9k2ZjwpM+aVXZn/HSyeQFQ2JHJNQGHby5IK0nNZloYiSlTJ/9ZVc0uSoQNUQJBAJFix2tD7b0Zq82xpeGt81rhXsofuerq1x9WM5UyYILCKJMHZw5lt58snINVzA7JxV+l60dbIgJjmRYm0yxQIAY=

src/main/resources/dev/sys.properties

@@ -5,7 +5,7 @@ listenOnIndexChange=false
 imageUri=http://218.17.158.219:8020/images/
 manageInner=http://192.168.253.60:9090/platform-manage
 im=http://113.105.74.131:8092
-b2c=http://tb2c.usoftchina.com
+b2c=http://test-mall.uuzcc.cn
 #file path
 outputFile=
 #enUU for the System Mall
@@ -56,8 +56,8 @@ inquiryServiceInnerUrl=http://188.131.128.107:24000
 messageServiceUrl=http://188.131.128.107:24001/
 
 #b2b
-b2b=http://tb2b.usoftchina.com
-b2bDomain=tb2b.usoftchina.com/b2b-test
+b2b=http://test-b2b.uuzcc.cn
+b2bDomain=test-b2b.uuzcc.cn/b2b-test
 
 #lottery
 lottery=http://192.168.253.3:26789/

src/main/webapp/resources/js/admin/controllers/statsDataCtrl.js

@@ -192,7 +192,7 @@ define([ 'app/app' ], function(app) {
         var getAllData = function (addStartFormatDate, addEndFormatDate, startFormatDate, endFormatDate) {
             var defer = $q.defer();
             User.isDevOrProd(null, function (data) {
-                var ssoUrl = data.data == 'success' ? 'https://sso.usoftchina.com' : 'http://188.131.128.107:24004',
+                var ssoUrl = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://188.131.128.107:24004',
                 // uasUrl = data.data == 'success' ? 'http://uas.ubtob.com' : 'http://192.168.253.12:9000/b2b-test',
                 commonUrl = data.data == 'success' ? 'https://api-inquiry.usoftchina.com' : 'https://tinquiry-api.usoftchina.com';
                 defer.resolve([

src/main/webapp/resources/js/sso/controllers/forstore/ssoCenterCtrl.js

@@ -63,7 +63,7 @@ define(['app/app', 'calendar'], function(app) {
 
         if ($rootScope.isAdmin) {
             User.isDevOrProd(null, function (data) {
-                $scope.urlPrex = data.data == 'success' ? 'https://sso.usoftchina.com' : 'http://188.131.128.107:24004';
+                $scope.urlPrex = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://188.131.128.107:24004';
                 $http({
                     method: 'get',
                     dataType: 'json',

src/main/webapp/resources/js/sso/controllers/staffManagementCtrl.js

@@ -26,7 +26,7 @@ define(['app/app'], function (app) {
         if ($scope.isAdmin) {
             User.isDevOrProd(null, function (data) {
                 // $scope.isProd = data.data;
-                $scope.urlPrex = data.data == 'success' ? 'https://sso.usoftchina.com' : 'http://188.131.128.107:24004';
+                $scope.urlPrex = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://188.131.128.107:24004';
                 applyToEnterpriseTableParams();
             }, function (response) {
                 toaster.pop('error', '获取运行环境失败');

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -81,7 +81,7 @@ define(['app/app'], function (app) {
         if ($scope.isAdmin) {
                 User.isDevOrProd(null, function (data) {
                     // $scope.isProd = data.data;
-                    $scope.urlPrex = data.data == 'success' ? 'https://sso.usoftchina.com' : 'http://188.131.128.107:24004';
+                    $scope.urlPrex = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://188.131.128.107:24004';
                     applyToEnterpriseTableParams();
                 }, function (response) {
                     toaster.pop('error', '获取运行环境失败');

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_index_ctrl.js

@@ -113,7 +113,7 @@ define(['app/app', 'calendar'], function(app) {
         if ($scope.isAdmin) {
             User.isDevOrProd(null, function (data) {
                 // $scope.isProd = data.data;
-                $scope.urlPrex = data.data == 'success' ? 'https://sso.usoftchina.com' : 'http://188.131.128.107:24004';
+                $scope.urlPrex = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://188.131.128.107:24004';
                 $http({
                     method: 'get',
                     dataType: 'json',