Merge branch 'dev-mysql' into feature_release-tomysql

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

@@ -33,7 +33,7 @@ public class NewsServiceImpl implements NewsService {
 	/**
 	 * 缓存刷新时间
 	 */
-	@Value("#{sys.newsRedisRefresh ?: 600}")
+	@Value("#{sys.newsRedisRefresh ?: 300}")
 	private long newsRedisRefresh;
 
 	@Autowired

src/main/resources/dev/sys.properties

@@ -27,7 +27,7 @@ reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2C
 # micro service IP(Swarm Manager IP)
 microServiceIp=10.10.100.23
 newsMicroServiceIp=news.usoftchina.com
-newsRedisRefresh=3600
+newsRedisRefresh=300
 floorMicroServiceIp=10.10.100.23
 carouselMicroServiceIp=10.10.100.23
 storecmsMicroServiceIp=192.168.253.12

src/main/resources/prod/sys.properties

@@ -28,7 +28,7 @@ reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2C
 # micro service IP(Swarm Manager IP)
 microServiceIp=10.10.100.23
 newsMicroServiceIp=news.usoftchina.com
-newsRedisRefresh=3600
+newsRedisRefresh=300
 floorMicroServiceIp=10.10.0.30
 carouselMicroServiceIp=10.10.0.188
 storecmsMicroServiceIp=10.10.0.30

src/main/resources/test/sys.properties

@@ -27,7 +27,7 @@ reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2C
 # micro service IP(Swarm Manager IP)
 microServiceIp=10.10.100.23
 newsMicroServiceIp=news.usoftchina.com
-newsRedisRefresh=3600
+newsRedisRefresh=300
 floorMicroServiceIp=10.10.100.23
 carouselMicroServiceIp=10.10.100.23
 storecmsMicroServiceIp=192.168.253.12

src/main/webapp/resources/js/usercenter/controllers/forstore/account_manager_ctrl.js

@@ -819,10 +819,9 @@ define(['app/app'], function (app) {
           $scope.checkFailed1 = false;
           $scope.checkFailed1_1 = false;
           $scope.emailEnable = function (newUserEmail) {
-            //邮箱不可用
+            //邮箱不可用 /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/
             if ((newUserEmail == null || newUserEmail.length > 30)
-                || !/^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(
-                    newUserEmail)) {
+                || newUserEmail.indexOf("@") == -1 || newUserEmail.indexOf(".") == -1) {
               $scope.checkSuccess1 = false;
               $scope.checkFailed1 = true;
               $scope.checkFailed1_1 = false;

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

@@ -760,8 +760,7 @@ define(['app/app'], function(app) {
           $scope.emailEnable = function (newUserEmail) {
             //邮箱不可用
             if ((newUserEmail == null || newUserEmail.length > 30)
-                || !(/^([0-9A-Za-z\-_\.]+)@([0-9a-z]+\.[a-z]{2,3}(\.[a-z]{2})?)$/g).test(
-                    newUserEmail)) {
+                || newUserEmail.indexOf("@") == -1 || newUserEmail.indexOf(".") == -1) {
               $scope.checkSuccess1 = false;
               $scope.checkFailed1 = true;
               $scope.checkFailed1_1 = false;

src/main/webapp/resources/view/admin/ads/ads_brand.html

@@ -8,8 +8,8 @@
             <div class="fullscreen" style="padding: 10px;overflow-y:auto;">
                 <table ng-table="brandsTableParams" class="table table-condensed table-bordered table-striped">
                     <tr ng-repeat="brand in $data">
-                        <td data-title="'品牌名'" filter="{nameCn: 'text'}">{{brand.nameCn}}</td>
-                        <td data-title="'厂商'" filter="{nameCn: 'text'}">{{brand.nameCn}}</td>
+                        <td data-title="'英文品牌名'" filter="{nameCn: 'text'}">{{brand.nameEn}}</td>
+                        <td data-title="'中文品牌名'" filter="{nameCn: 'text'}">{{brand.nameCn}}</td>
                         <td data-title="'权重'" >{{brand.weight}}</td>
                         <td data-title="'操作'">
                             <button ng-click="updateweight(brand)" class="btn btn-danger btn-sm" ng-if="!brand.weight"><i class="fa fa-check"></i> 推广</button>