Merge branch 'develop'

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>0.2.0</version>
+        <version>0.2.0-dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

src/main/java/au/com/royalpay/payment/manage/management/sysconfig/core/impls/PermissionPartnerManagerImpl.java

@@ -109,21 +109,24 @@ public class PermissionPartnerManagerImpl implements PermissionPartnerManager {
             mod.put("funcs", funcList);
             modules.add(mod);
         }
-
         report.put("modules", modules);
         return report;
     }
 
     @Override
+    @Transactional
     public void permissionClientModuleSave(int clientId, String clientMoniker) {
+        permissionClientModulesService.removeByClientMoniker(clientMoniker);
         List<JSONObject> moduleId = permissionPartnerModuleMapper.list();
         for (JSONObject moduleClientAdd : moduleId) {
             moduleClientAdd.put("client_id", clientId);
             moduleClientAdd.put("client_moniker", clientMoniker);
             moduleClientAdd.put("module_id", moduleClientAdd.getString("id"));
-            moduleClientAdd.put("is_valid", true);
+            moduleClientAdd.put("is_valid", moduleClientAdd.getBoolean("initialize"));
             permissionClientModulesService.save(moduleClientAdd);
         }
+        systemPackageCacheSupport.clearClientPermission(clientMoniker);
+        systemPackageCacheSupport.clearClientPermission(clientId);
 
     }
 
@@ -152,13 +155,10 @@ public class PermissionPartnerManagerImpl implements PermissionPartnerManager {
                 permissionClientModulesService.save(clientMod);
             }
         }
-
         module.initObject(mod);
         permissionPartnerModuleMapper.update(mod);
-        sysPermissionClientModulesMapper.updateFunctionValid(mod.getString("id"),mod.getBooleanValue("initialize"));
-        systemPackageCacheSupport.clearClientPermissionAll();
-
-
+//        sysPermissionClientModulesMapper.updateFunctionValid(mod.getString("id"), mod.getBooleanValue("initialize"));
+//        systemPackageCacheSupport.clearClientPermissionAll();
     }
 
     @Override
@@ -214,7 +214,6 @@ public class PermissionPartnerManagerImpl implements PermissionPartnerManager {
     @Transactional
     @CacheEvict(value = ":login:partners:", allEntries = true)
     public void authorizeRole(PartnerRole role, List<String> functions) {
-
         permissionPartnerFunctionMapper.clearRolePermission(role.getCode());
         permissionPartnerFunctionMapper.authorizeRole(role.getCode(), functions);
     }

src/main/java/au/com/royalpay/payment/manage/management/sysconfig/web/SysPermissionClientController.java

@@ -1,6 +1,8 @@
 package au.com.royalpay.payment.manage.management.sysconfig.web;
 
 import au.com.royalpay.payment.manage.management.sysconfig.beans.PermissionClientVO;
+import au.com.royalpay.payment.manage.management.sysconfig.core.PermissionPartnerManager;
+import au.com.royalpay.payment.manage.merchants.core.ClientManager;
 import au.com.royalpay.payment.manage.system.core.PermissionClientModulesService;
 import au.com.royalpay.payment.tools.CommonConsts;
 
@@ -26,6 +28,10 @@ import javax.annotation.Resource;
 public class SysPermissionClientController {
     @Resource
     private PermissionClientModulesService permissionClientModulesService;
+    @Resource
+    private PermissionPartnerManager permissionPartnerManager;
+    @Resource
+    private ClientManager clientManager;
 
 
     @RequestMapping(value = "/list", method = RequestMethod.GET)
@@ -38,4 +44,11 @@ public class SysPermissionClientController {
         permissionClientModulesService.switchValid(id,permissionClientVO.getIsValid(),loginManager);
     }
 
+    @RequestMapping(value = "/init", method = RequestMethod.POST)
+    public void init(@RequestBody JSONObject param) {
+        JSONObject client = clientManager.getClientInfoByMoniker(param.getString("client_moniker"));
+        permissionPartnerManager.permissionClientModuleSave(client.getIntValue("client_id"),client.getString("client_moniker"));
+    }
+
+
 }

src/main/java/au/com/royalpay/payment/manage/mappers/system/SysPermissionClientModulesMapper.java

@@ -24,6 +24,8 @@ public interface SysPermissionClientModulesMapper {
 
     void delete(@Param("module_name") String moduleName);
 
+    void deleteByClientMoniker(@Param("client_moniker") String client_moniker);
+
     @AutoSql(type = SqlType.SELECT)
     List<JSONObject> listByClientId(@Param("client_id") int client_id);
 

src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java

@@ -111,6 +111,8 @@ public class ManagerUserInterceptor extends HandlerInterceptorAdapter implements
         if(func!=null && StringUtils.isNotEmpty(func.getString("module_id"))){
             JSONArray arr = loginUser.getJSONArray("available_module_ids");
             if (arr == null || !arr.contains(func.getString("module_id"))) {
+                logger.info(partner.toString());
+                logger.info(partnerStatusKey);
                 logger.info(funcId);
                 throw new ForbiddenException("error.permission.nopermission");
             }

src/main/java/au/com/royalpay/payment/manage/system/core/PermissionClientModulesService.java

@@ -19,4 +19,5 @@ public interface PermissionClientModulesService {
 
     void switchValid(Long id,boolean isValid,JSONObject account);
 
+    void removeByClientMoniker(String clientMoniker);
 }

src/main/java/au/com/royalpay/payment/manage/system/core/impl/PermissionClientModulesServiceImpl.java

@@ -72,6 +72,11 @@ public class PermissionClientModulesServiceImpl implements PermissionClientModul
 
     }
 
+    @Override
+    public void removeByClientMoniker(String clientMoniker) {
+        permissionClientModulesMapper.deleteByClientMoniker(clientMoniker);
+    }
+
     private void saveMongoLog(JSONObject account, JSONObject oldRecord, JSONObject modifyData, String business) {
         try {
             modifyData.remove("id");

src/main/resources/au/com/royalpay/payment/manage/mappers/system/SysPermissionClientModulesMapper.xml

@@ -28,4 +28,9 @@
         delete from sys_permission_partner_modules_clients
         where module_id = (SELECT id from sys_permission_partner_modules where module_name=#{module_name})
     </delete>
+
+    <delete id="deleteByClientMoniker">
+        delete from sys_permission_partner_modules_clients
+        where client_moniker= #{client_moniker}
+    </delete>
 </mapper>

src/main/ui/static/application/apply_open_quickly.js

@@ -90,6 +90,9 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
 
             $scope.uploadLogo = function (file) {
                 if (file != null) {
+                    if (file.size > 1 * 1024 * 1024) {
+                        commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'});
+                    } else {
                         $scope.logoProgress = {value: 0};
                         Upload.upload({
                             url: '/attachment/files',
@@ -105,10 +108,14 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
                             $scope.logoProgress.value = parseInt(100 * evt.loaded / evt.total);
                         })
                     }
+                }
             };
 
             $scope.uploadShopPhoto = function (file) {
                 if (file != null) {
+                    if (file.size > 2 * 1024 * 1024) {
+                        commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'});
+                    } else {
                         $scope.photoProgress = {value: 0};
                         Upload.upload({
                             url: '/attachment/files',
@@ -123,6 +130,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
                             $scope.photoProgress.value = parseInt(100 * evt.loaded / evt.total);
                         })
                     }
+                }
             };
 
 

src/main/ui/static/application/clientAuthentication.js

@@ -90,6 +90,9 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
             };
             $scope.uploadLogo = function (file) {
                 if (file != null) {
+                    if (file.size > 1 * 1024 * 1024) {
+                        commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'});
+                    } else {
                         $scope.logoProgress = {value: 0};
                         Upload.upload({
                             url: '/attachment/files',
@@ -105,10 +108,14 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
                             $scope.logoProgress.value = parseInt(100 * evt.loaded / evt.total);
                         })
                     }
+                }
             };
 
             $scope.uploadShopPhoto = function (file) {
                 if (file != null) {
+                    if (file.size > 2 * 1024 * 1024) {
+                        commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'});
+                    } else {
                         $scope.photoProgress = {value: 0};
                         Upload.upload({
                             url: '/attachment/files',
@@ -123,6 +130,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
                             $scope.photoProgress.value = parseInt(100 * evt.loaded / evt.total);
                         })
                     }
+                }
             };
 
             //bankinfo
@@ -176,6 +184,9 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
             //audit files
             $scope.uploadBankFile = function (file) {
                 if (file != null) {
+                    if (file.size > 1 * 1024 * 1024) {
+                        commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'});
+                    } else {
                         $scope.bankFileProgress = {value: 0};
                         Upload.upload({
                             url: '/attachment/files',
@@ -190,10 +201,14 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
                             $scope.bankFileProgress.value = parseInt(100 * evt.loaded / evt.total);
                         })
                     }
+                }
             };
 
             $scope.uploadCompanyFile = function (file) {
                 if (file != null) {
+                    if (file.size > 2 * 1024 * 1024) {
+                        commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'});
+                    } else {
                         $scope.companyFileProgress = {value: 0};
                         Upload.upload({
                             url: '/attachment/files',
@@ -208,6 +223,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
                             $scope.companyFileProgress.value = parseInt(100 * evt.loaded / evt.total);
                         })
                     }
+                }
             };
 
 

src/main/ui/static/application/templates/apply_basicinfo.html

@@ -63,7 +63,7 @@
                                 <div class="col-sm-8">
                                     <div class="form-control-static">
                                         <button class="btn btn-success" type="button" ngf-select="uploadLogo($file)"
-                                                accept="image/*" ngf-max-size="1MB">
+                                                accept="image/*">
                                             <i class="fa fa-upload"></i> Upload Logo
                                         </button>
                                     </div>
@@ -110,7 +110,7 @@
                                 <div class="col-sm-8">
                                     <div class="form-control-static">
                                         <button class="btn btn-primary" type="button"
-                                                ngf-select="uploadShopPhoto($file)" accept="image/*" ngf-max-size="2MB">
+                                                ngf-select="uploadShopPhoto($file)" accept="image/*">
                                             <i class="fa fa-upload"></i> Upload Shop Photo
                                         </button>
                                     </div>

src/main/ui/static/application/templates/clientAuthentication.html

@@ -84,7 +84,7 @@
                                 <div class="col-sm-8">
                                     <div class="form-control-static">
                                         <button class="btn btn-success" type="button" ngf-select="uploadLogo($file)"
-                                                accept="image/*" ngf-max-size="1MB">
+                                                accept="image/*">
                                             <i class="fa fa-upload"></i> Upload Logo
                                         </button>
                                     </div>
@@ -186,7 +186,7 @@
                                 <div class="col-sm-8">
                                     <div class="form-control-static">
                                         <button class="btn btn-primary" type="button"
-                                                ngf-select="uploadShopPhoto($file)" accept="image/*" ngf-max-size="2MB">
+                                                ngf-select="uploadShopPhoto($file)" accept="image/*">
                                             <i class="fa fa-upload"></i> Upload Shop Photo
                                         </button>
                                     </div>
@@ -492,7 +492,7 @@
                                 <div class="col-sm-4">
                                     <div class="form-control-static">
                                         <button class="btn btn-primary" type="button"
-                                                ngf-select="uploadBankFile($file)" accept="image/*" ngf-max-size="2MB">
+                                                ngf-select="uploadBankFile($file)" accept="image/*">
                                             <i class="fa fa-upload"></i> Upload
                                         </button>
                                     </div>
@@ -512,7 +512,7 @@
                                 <div class="col-sm-4">
                                     <div class="form-control-static">
                                         <button class="btn btn-primary" type="button"
-                                                ngf-select="uploadCompanyFile($file)" accept="image/*" ngf-max-size="2MB">
+                                                ngf-select="uploadCompanyFile($file)" accept="image/*">
                                             <i class="fa fa-upload"></i> Upload
                                         </button>
                                     </div>

src/main/ui/static/config/onedollarday/onedollarday.js

@@ -200,7 +200,7 @@ define(['angular'], function (angular) {
         };
     }]);
 
-    app.controller('merchantConfigDialogCtrl', ['$scope', '$http', 'Upload', 'merchant', function ($scope, $http, Upload, merchant) {
+    app.controller('merchantConfigDialogCtrl', ['$scope', '$http', 'Upload', 'merchant', 'commonDialog', function ($scope, $http, Upload, merchant, commonDialog) {
         $scope.merchant = angular.copy(merchant);
         $scope.save = function () {
             $scope.errmsg = null;
@@ -219,6 +219,10 @@ define(['angular'], function (angular) {
             if(!file){
                 return;
             }
+            if (file.size > 1 * 1024 * 1024) {
+                commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'});
+                return;
+            }
             $scope.photoProgress = {value: 0};
             Upload.upload({
                 url: '/attachment/files',

src/main/ui/static/config/onedollarday/templates/merchant_config.html

@@ -10,7 +10,7 @@
 
         <div class="form-group col-xs-12">
             <button class="btn btn-success" type="button" ngf-select="uploadShopImg($file)"
-                    accept="image/*" ngf-max-size="1MB">
+                    accept="image/*">
                 <i class="fa fa-upload"></i> Upload Shop Img
             </button>
             <uib-progressbar value="photoProgress.value" ng-if="photoProgress"></uib-progressbar>

src/main/ui/static/config/organizations/organizations.js

@@ -108,6 +108,10 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
             if (file == null) {
                 return;
             }
+            if (file.size > 1 * 1024 * 1024) {
+                commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'});
+                return;
+            }
             $scope.logoProgress = {value: 0};
             Upload.upload({
                 url: '/attachment/files',
@@ -215,6 +219,10 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
             if (file == null) {
                 return;
             }
+            if (file.size > 1 * 1024 * 1024) {
+                commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'});
+                return;
+            }
             $scope.logoProgress = {value: 0};
             Upload.upload({
                 url: '/attachment/files',
@@ -321,6 +329,10 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
             if (file == null) {
                 return;
             }
+            if (file.size > 1 * 1024 * 1024) {
+                commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'});
+                return;
+            }
             $scope.logoProgress = {value: 0};
             Upload.upload({
                 url: '/attachment/files',

src/main/ui/static/config/organizations/templates/new_org.html

@@ -24,7 +24,7 @@
                         <div class="col-sm-8">
                             <p class="form-control-static">
                                 <button class="btn btn-primary" type="button" ngf-select="uploadLogo($file)"
-                                        accept="image/*" ngf-max-size="1MB">
+                                        accept="image/*">
                                     <i class="fa fa-upload"></i> Upload
                                 </button>
                                 <uib-progressbar value="logoProgress.value" ng-if="logoProgress"></uib-progressbar>

src/main/ui/static/config/organizations/templates/org_detail.html

@@ -36,7 +36,7 @@
                                 <div class="col-sm-8">
                                     <p class="form-control-static">
                                         <button class="btn btn-primary" type="button" ngf-select="uploadLogo($file)"
-                                                accept="image/*" ngf-max-size="1MB">
+                                                accept="image/*">
                                             <i class="fa fa-upload"></i> Upload
                                         </button>
                                         <uib-progressbar value="logoProgress.value" ng-if="logoProgress"></uib-progressbar>

src/main/ui/static/config/organizations/templates/org_detail_parent.html

@@ -173,7 +173,7 @@
                                 <div class="col-sm-8">
                                     <p class="form-control-static">
                                         <button class="btn btn-primary" type="button" ngf-select="uploadLogo($file)"
-                                                accept="image/*" ngf-max-size="1MB">
+                                                accept="image/*">
                                             <i class="fa fa-upload"></i> Upload
                                         </button>
                                         <uib-progressbar value="logoProgress.value" ng-if="logoProgress"></uib-progressbar>

src/main/ui/static/payment/cashiers/cashier-manage.js

@@ -51,6 +51,9 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
         $scope.cashier = {};
         $scope.uploadPhoto = function (file) {
             if (file != null) {
+                if (file.size > 2 * 1024 * 1024) {
+                    commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'})
+                } else {
                     $scope.photoProgress = {value: 0};
                     Upload.upload({
                         url: '/attachment/files',
@@ -65,6 +68,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
                         $scope.photoProgress.value = parseInt(100 * evt.loaded / evt.total);
                     })
                 }
+            }
         };
         $scope.save = function (form) {
             if (form.$invalid) {
@@ -178,6 +182,9 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
             $scope.cashier = angular.copy(cashier.data);
             $scope.uploadPhoto = function (file) {
                 if (file != null) {
+                    if (file.size > 2 * 1024 * 1024) {
+                        commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'})
+                    } else {
                         $scope.photoProgress = {value: 0};
                         Upload.upload({
                             url: '/attachment/files',
@@ -192,6 +199,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
                             $scope.photoProgress.value = parseInt(100 * evt.loaded / evt.total);
                         })
                     }
+                }
             };
             $scope.updateCashier = function (form) {
                 if (form.$invalid) {

src/main/ui/static/payment/cashiers/templates/cashier_add.html

@@ -71,7 +71,7 @@
                                 <div class="col-sm-8">
                                     <div class="form-control-static">
                                         <button class="btn btn-primary" type="button"
-                                                ngf-select="uploadPhoto($file)" accept="image/*" ngf-max-size="2MB">
+                                                ngf-select="uploadPhoto($file)" accept="image/*">
                                             <i class="fa fa-upload"></i> Upload Courier Photo
                                         </button>
                                     </div>

src/main/ui/static/payment/cashiers/templates/cashier_edit.html

@@ -59,7 +59,7 @@
                                 <div class="col-sm-8">
                                     <div class="form-control-static">
                                         <button class="btn btn-primary" type="button"
-                                                ngf-select="uploadPhoto($file)" accept="image/*" ngf-max-size="2MB">
+                                                ngf-select="uploadPhoto($file)" accept="image/*">
                                             <i class="fa fa-upload"></i> Upload Cashier Photo
                                         </button>
                                     </div>

src/main/ui/static/payment/good/good-manage.js

@@ -93,6 +93,9 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
         $scope.good.images = [];
         $scope.uploadImage = function (file) {
             if (file != null) {
+                if (file.size > 1 * 1024 * 1024) {
+                    commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'})
+                } else {
                     $scope.imageProgress = {value: 0};
                     Upload.upload({
                         url: '/attachment/files',
@@ -110,6 +113,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
                         $scope.imageProgress.value = parseInt(100 * evt.loaded / evt.total);
                     })
                 }
+            }
         };
     }]);
     app.controller('goodDetailCtrl', ['$scope', '$http', '$state', '$uibModal', 'commonDialog', 'good', function ($scope, $http, $state, $uibModal, commonDialog, good) {
@@ -172,6 +176,9 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
             };
             $scope.uploadImage = function (file) {
                 if (file != null) {
+                    if (file.size > 1 * 1024 * 1024) {
+                        commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'})
+                    } else {
                         $scope.imageProgress = {value: 0};
                         Upload.upload({
                             url: '/attachment/files',
@@ -189,6 +196,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
                             $scope.imageProgress.value = parseInt(100 * evt.loaded / evt.total);
                         })
                     }
+                }
             };
         }]);
     app.controller('goodInfoCtrl', ['$scope', '$http', '$state', 'commonDialog', function ($scope, $http, $state, commonDialog) {

src/main/ui/static/payment/good/templates/add_good.html

@@ -136,7 +136,7 @@
                                 <div class="col-sm-8">
                                     <div class="form-control-static">
                                         <button class="btn btn-success" type="button" ngf-select="uploadImage($file)"
-                                                accept="image/*" ngf-max-size="1MB">
+                                                accept="image/*">
                                             <i class="fa fa-upload"></i> Upload Image
                                         </button>
                                     </div>

src/main/ui/static/payment/good/templates/good_edit.html

@@ -147,7 +147,7 @@
                                 <div class="col-sm-8">
                                     <div class="form-control-static">
                                         <button class="btn btn-success" type="button" ngf-select="uploadImage($file)"
-                                                accept="image/*" ngf-max-size="1MB">
+                                                accept="image/*">
                                             <i class="fa fa-upload"></i> Upload Image
                                         </button>
                                     </div>

src/main/ui/static/payment/partner/partner-manage.js

@@ -439,6 +439,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         };
         $scope.uploadLogo = function (file) {
             if (file != null) {
+                if (file.size > 1 * 1024 * 1024) {
+                    commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'})
+                } else {
                     $scope.logoProgress = {value: 0};
                     Upload.upload({
                         url: '/attachment/files',
@@ -454,10 +457,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                         $scope.logoProgress.value = parseInt(100 * evt.loaded / evt.total);
                     })
                 }
+            }
         };
 
         $scope.uploadShopPhoto = function (file) {
             if (file != null) {
+                if (file.size > 2 * 1024 * 1024) {
+                    commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'})
+                } else {
                     $scope.shopPhotoProgress = {value: 0};
                     Upload.upload({
                         url: '/attachment/files',
@@ -472,10 +479,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                         $scope.shopPhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
                     })
                 }
+            }
         };
 
         $scope.uploadStorePhoto = function (file) {
             if (file != null) {
+                if (file.size > 2 * 1024 * 1024) {
+                    commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'})
+                } else {
                     $scope.storePhotoProgress = {value: 0};
                     Upload.upload({
                         url: '/attachment/files',
@@ -490,6 +501,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                         $scope.storePhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
                     })
                 }
+            }
         };
 
         $scope.updateMerchantLocation = function () {
@@ -677,6 +689,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         };
         $scope.uploadAgreeFile = function (file) {
             if (file != null) {
+                if (file.size > 2 * 1024 * 1024) {
+                    commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'})
+                } else {
                     Upload.upload({
                         url: '/attachment/files',
                         data: {file: file}
@@ -696,6 +711,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                         commonDialog.alert({title: 'Upload Failed', content: resp.data.message, type: 'error'})
                     })
                 }
+            }
         };
         $scope.notifyBD = function () {
             $http.get('/sys/partners/' + $scope.partner.client_moniker + '/notify/completeAgree').then(function () {
@@ -1093,6 +1109,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             };
             $scope.uploadLogo = function (file) {
                 if (file != null) {
+                    if (file.size > 1 * 1024 * 1024) {
+                        commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'})
+                    } else {
                         $scope.logoProgress = {value: 0};
                         Upload.upload({
                             url: '/attachment/files',
@@ -1108,10 +1127,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                             $scope.logoProgress.value = parseInt(100 * evt.loaded / evt.total);
                         })
                     }
+                }
             };
 
             $scope.uploadShopPhoto = function (file) {
                 if (file != null) {
+                    if (file.size > 2 * 1024 * 1024) {
+                        commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'})
+                    } else {
                         $scope.shopPhotoProgress = {value: 0};
                         Upload.upload({
                             url: '/attachment/files',
@@ -1126,10 +1149,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                             $scope.shopPhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
                         })
                     }
+                }
             };
 
             $scope.uploadStorePhoto = function (file) {
                 if (file != null) {
+                    if (file.size > 2 * 1024 * 1024) {
+                        commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'})
+                    } else {
                         $scope.storePhotoProgress = {value: 0};
                         Upload.upload({
                             url: '/attachment/files',
@@ -1144,6 +1171,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                             $scope.storePhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
                         })
                     }
+                }
             };
 
             $scope.getMerchantLocation = function () {
@@ -2108,6 +2136,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             }
             $scope.uploadLogo = function (file) {
                 if (file != null) {
+                    if (file.size > 1 * 1024 * 1024) {
+                        commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'})
+                    } else {
                         $scope.logoProgress = {value: 0};
                         Upload.upload({
                             url: '/attachment/files',
@@ -2123,10 +2154,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                             $scope.logoProgress.value = parseInt(100 * evt.loaded / evt.total);
                         })
                     }
+                }
             };
 
             $scope.uploadShopPhoto = function (file) {
                 if (file != null) {
+                    if (file.size > 2 * 1024 * 1024) {
+                        commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'})
+                    } else {
                         $scope.shopPhotoProgress = {value: 0};
                         Upload.upload({
                             url: '/attachment/files',
@@ -2141,10 +2176,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                             $scope.shopPhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
                         })
                     }
+                }
             };
 
             $scope.uploadStorePhoto = function (file) {
                 if (file != null) {
+                    if (file.size > 2 * 1024 * 1024) {
+                        commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'})
+                    } else {
                         $scope.storePhotoProgress = {value: 0};
                         Upload.upload({
                             url: '/attachment/files',
@@ -2159,6 +2198,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                             $scope.storePhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
                         })
                     }
+                }
             };
             $scope.updateMerchantLocation = function () {
                 var params = window.frames['merchant_detail'].merchant_location;
@@ -3107,6 +3147,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             })
         };
 
+        $scope.init = function () {
+            var params = {client_moniker:$scope.partner.client_moniker};
+            $http.post('/sys/permission/init',params).then(function (resp) {
+            },function (resp) {
+                commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
+            })
+        };
+
     }]);
 
 

src/main/ui/static/payment/partner/partner.js

@@ -72,6 +72,9 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
 
         $scope.uploadLogo = function (file) {
             if (file != null) {
+                if (file.size > 1 * 1024 * 1024) {
+                    commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'})
+                } else {
                     $scope.logoProgress = {value: 0};
                     Upload.upload({
                         url: '/attachment/files',
@@ -87,10 +90,14 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
                         $scope.logoProgress.value = parseInt(100 * evt.loaded / evt.total);
                     })
                 }
+            }
         };
 
         $scope.uploadShopPhoto = function (file) {
             if (file != null) {
+                if (file.size > 2 * 1024 * 1024) {
+                    commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'})
+                } else {
                     $scope.shopPhotoProgress = {value: 0};
                     Upload.upload({
                         url: '/attachment/files',
@@ -105,10 +112,14 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
                         $scope.shopPhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
                     })
                 }
+            }
         };
 
         $scope.uploadStorePhoto = function (file) {
             if (file != null) {
+                if (file.size > 2 * 1024 * 1024) {
+                    commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'})
+                } else {
                     $scope.storePhotoProgress = {value: 0};
                     Upload.upload({
                         url: '/attachment/files',
@@ -123,6 +134,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
                         $scope.storePhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
                     })
                 }
+            }
         };
 
         $scope.updatePartner = function (form) {
@@ -223,6 +235,9 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
 
         $scope.uploadLogo = function (file) {
             if (file != null) {
+                if (file.size > 1 * 1024 * 1024) {
+                    commonDialog.alert({title: 'Error', content: '文件大小不能超过1MB，请压缩后重试', type: 'error'})
+                } else {
                     $scope.logoProgress = {value: 0};
                     Upload.upload({
                         url: '/attachment/files',
@@ -238,10 +253,14 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
                         $scope.logoProgress.value = parseInt(100 * evt.loaded / evt.total);
                     })
                 }
+            }
         };
 
         $scope.uploadShopPhoto = function (file) {
             if (file != null) {
+                if (file.size > 2 * 1024 * 1024) {
+                    commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'})
+                } else {
                     $scope.shopPhotoProgress = {value: 0};
                     Upload.upload({
                         url: '/attachment/files',
@@ -256,10 +275,14 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
                         $scope.shopPhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
                     })
                 }
+            }
         };
 
         $scope.uploadStorePhoto = function (file) {
             if (file != null) {
+                if (file.size > 2 * 1024 * 1024) {
+                    commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'})
+                } else {
                     $scope.storePhotoProgress = {value: 0};
                     Upload.upload({
                         url: '/attachment/files',
@@ -274,6 +297,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
                         $scope.storePhotoProgress.value = parseInt(100 * evt.loaded / evt.total);
                     })
                 }
+            }
         };
 
         $scope.updatePartner = function (form) {

src/main/ui/static/payment/partner/templates/add_partner.html

@@ -127,7 +127,7 @@
                                     <div class="form-control-static">
                                         <button class="btn btn-success" type="button"
                                                 ngf-select="uploadLogo($file)"
-                                                accept="image/*" ngf-max-size="1MB">
+                                                accept="image/*">
                                             <i class="fa fa-upload"></i> Upload Logo
                                         </button>
                                     </div>
@@ -230,8 +230,7 @@
                                     <div class="col-sm-4">
                                         <div class="form-control-static"><em>1:</em>&nbsp;
                                             <button class="btn btn-primary" type="button"
-                                                    ngf-select="uploadShopPhoto($file)" accept="image/*"
-                                                    ngf-max-size="2MB">
+                                                    ngf-select="uploadShopPhoto($file)" accept="image/*">
                                                 <i class="fa fa-upload"></i> Upload Shop Photo1
                                             </button>
                                         </div>
@@ -242,8 +241,7 @@
                                     <div class="col-sm-4">
                                         <div class="form-control-static"><em>2:</em>&nbsp;
                                             <button class="btn btn-primary" type="button"
-                                                    ngf-select="uploadStorePhoto($file)" accept="image/*"
-                                                    ngf-max-size="2MB">
+                                                    ngf-select="uploadStorePhoto($file)" accept="image/*">
                                                 <i class="fa fa-upload"></i> Upload Shop Photo2
                                             </button>
                                         </div>

src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html

@@ -98,7 +98,7 @@
                                         <div class="col-sm-8">
                                             <div class="form-control-static">
                                                 <button class="btn btn-success" type="button" ngf-select="uploadLogo($file)"
-                                                        accept="image/*" ngf-max-size="1MB">
+                                                        accept="image/*">
                                                     <i class="fa fa-upload"></i> Upload Logo
                                                 </button>
                                             </div>
@@ -188,8 +188,7 @@
                                         <div class="col-sm-4">
                                             <div class="form-control-static"><em>1:</em>&nbsp;
                                                 <button class="btn btn-primary" type="button"
-                                                        ngf-select="uploadShopPhoto($file)" accept="image/*"
-                                                        ngf-max-size="2MB">
+                                                        ngf-select="uploadShopPhoto($file)" accept="image/*">
                                                     <i class="fa fa-upload"></i> Upload Shop Photo1
                                                 </button>
                                             </div>
@@ -200,8 +199,7 @@
                                         <div class="col-sm-4">
                                             <div class="form-control-static"><em>2:</em>&nbsp;
                                                 <button class="btn btn-primary" type="button"
-                                                        ngf-select="uploadStorePhoto($file)" accept="image/*"
-                                                        ngf-max-size="2MB">
+                                                        ngf-select="uploadStorePhoto($file)" accept="image/*">
                                                     <i class="fa fa-upload"></i> Upload Shop Photo2
                                                 </button>
                                             </div>

src/main/ui/static/payment/partner/templates/client_partner_detail.html

@@ -363,7 +363,7 @@
                                             <div class="form-control-static">
                                                 <button class="btn btn-success" type="button"
                                                         ngf-select="uploadLogo($file)"
-                                                        accept="image/*" ngf-max-size="1MB">
+                                                        accept="image/*">
                                                     <i class="fa fa-upload"></i> Upload Logo
                                                 </button>
                                             </div>
@@ -430,8 +430,7 @@
                                         <div class="col-sm-5">
                                             <div class="form-control-static"><em>1:</em>&nbsp;
                                                 <button class="btn btn-primary" type="button"
-                                                        ngf-select="uploadShopPhoto($file)" accept="image/*"
-                                                        ngf-max-size="2MB">
+                                                        ngf-select="uploadShopPhoto($file)" accept="image/*">
                                                     <i class="fa fa-upload"></i> Upload Shop Photo1
                                                 </button>
                                             </div>
@@ -443,8 +442,7 @@
                                         <div class="col-sm-5">
                                             <div class="form-control-static"><em>2:</em>&nbsp;
                                                 <button class="btn btn-primary" type="button"
-                                                        ngf-select="uploadStorePhoto($file)" accept="image/*"
-                                                        ngf-max-size="2MB">
+                                                        ngf-select="uploadStorePhoto($file)" accept="image/*">
                                                     <i class="fa fa-upload"></i> Upload Shop Photo2
                                                 </button>
                                             </div>

src/main/ui/static/payment/partner/templates/client_partner_edit.html

@@ -58,7 +58,7 @@
                                 <div class="col-sm-8">
                                     <div class="form-control-static">
                                         <button class="btn btn-success" type="button" ngf-select="uploadLogo($file)"
-                                                accept="image/*" ngf-max-size="1MB">
+                                                accept="image/*">
                                             <i class="fa fa-upload"></i> Upload Logo
                                         </button>
                                     </div>
@@ -105,7 +105,7 @@
                                 <div class="col-sm-5">
                                     <div class="form-control-static"><em>1:</em>&nbsp;
                                         <button class="btn btn-primary" type="button"
-                                                ngf-select="uploadShopPhoto($file)" accept="image/*" ngf-max-size="2MB">
+                                                ngf-select="uploadShopPhoto($file)" accept="image/*">
                                             <i class="fa fa-upload"></i> Upload Shop Photo1
                                         </button>
                                     </div>
@@ -116,8 +116,7 @@
                                 <div class="col-sm-5">
                                     <div class="form-control-static"><em>2:</em>&nbsp;
                                         <button class="btn btn-primary" type="button"
-                                                ngf-select="uploadStorePhoto($file)" accept="image/*"
-                                                ngf-max-size="2MB">
+                                                ngf-select="uploadStorePhoto($file)" accept="image/*">
                                             <i class="fa fa-upload"></i> Upload Shop Photo2
                                         </button>
                                     </div>

src/main/ui/static/payment/partner/templates/partner_detail.html

@@ -85,7 +85,7 @@
                 <a role="button" type="button" class="btn btn-success" ng-click="exportAgreegatePDF()">
                     制作全支付合同</a>
                 <a role="button" type="button" class="btn btn-warning" ngf-select="uploadAgreeFile($file)"
-                   accept="pdf/*" ngf-max-size="2MB">
+                   accept="pdf/*">
                     上传合同</a> (通用合同请选择制作合同,非通用合同模板请人工制作合同后上传)
             </div>
             <div class="btn-group pull-right" role="group" aria-label="...">

src/main/ui/static/payment/partner/templates/partner_edit.html

@@ -166,7 +166,7 @@
                                 <div class="col-sm-8">
                                     <div class="form-control-static">
                                         <button class="btn btn-success" type="button" ngf-select="uploadLogo($file)"
-                                                accept="image/*" ngf-max-size="1MB">
+                                                accept="image/*">
                                             <i class="fa fa-upload"></i> Upload Logo
                                         </button>
                                     </div>
@@ -255,7 +255,7 @@
                                 <div class="col-sm-5">
                                     <div class="form-control-static"><em>1:</em>&nbsp;
                                         <button class="btn btn-primary" type="button"
-                                                ngf-select="uploadShopPhoto($file)" accept="image/*" ngf-max-size="2MB">
+                                                ngf-select="uploadShopPhoto($file)" accept="image/*">
                                             <i class="fa fa-upload"></i> Upload Shop Photo1
                                         </button>
                                     </div>
@@ -266,8 +266,7 @@
                                 <div class="col-sm-5">
                                     <div class="form-control-static"><em>2:</em>&nbsp;
                                         <button class="btn btn-primary" type="button"
-                                                ngf-select="uploadStorePhoto($file)" accept="image/*"
-                                                ngf-max-size="2MB">
+                                                ngf-select="uploadStorePhoto($file)" accept="image/*">
                                             <i class="fa fa-upload"></i> Upload Shop Photo2
                                         </button>
                                     </div>

src/main/ui/static/payment/partner/templates/partner_permission.html

@@ -1,6 +1,8 @@
 <div class="row">
     <div class="col-sm-12">
         <h3 class="box-title" style="display: inherit">Permissions</h3>
+        <a role="button" type="button" class="btn btn-success" ng-click="init()">
+            初始化权限</a>
         <div class="table-responsive col-sm-12">
             <table class="table table-bordered table-hover table-striped">
                 <thead>

src/main/ui/static/payment/product/product_manager.js

@@ -30,6 +30,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         };
         $scope.importExcel = function (file) {
             if (file != null) {
+                if (file.size > 2 * 1024 * 1024) {
+                    commonDialog.alert({title: 'Error', content: '文件大小不能超过2MB，请压缩后重试', type: 'error'})
+                } else {
                     Upload.upload({
                         url: '/attachment/files',
                         data: {file: file}
@@ -50,6 +53,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     })
                 }
             }
+        };
         $scope.deleteProduct = function (product) {
             commonDialog.confirm({
                 title: 'Confirm',

src/main/ui/static/payment/product/templates/product.html

@@ -31,7 +31,7 @@
                             <div class="form-group col-sm-5">
                                 <div class="pull-right">
                                     <button class="btn btn-success" type="button" ngf-select="importExcel($file)"
-                                            ngf-max-size="2MB" ng-if="importShow==1">
+                                            ng-if="importShow==1">
                                         <i class="fa fa-upload"></i> 导入Excel
                                     </button>
                                 <button role="button" class="btn btn-info" title="Add Product"