zhouweidong 发布系统代码

app_web/public/assets/json/view-config.json

 {
     "paytradeeditview": {
         "title": "支付交易编辑视图",
-        "caption": "支付交易",
+        "caption": "支付交易1",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "pay",
         "viewname": "PayTradeEditView",
@@ -9,7 +9,7 @@
     },
     "paytradegridview": {
         "title": "支付交易表格视图",
-        "caption": "支付交易",
+        "caption": "支付交易1",
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "pay",
         "viewname": "PayTradeGridView",

app_web/src/authservice/pay-trade/pay-trade-auth-service-base.ts

 import AuthService from '../auth-service';
 
 /**
- * 支付交易权限服务对象基类
+ * 支付交易1权限服务对象基类
  *
  * @export
  * @class PayTradeAuthServiceBase

app_web/src/authservice/pay-trade/pay-trade-auth-service.ts

@@ -2,7 +2,7 @@ import PayTradeAuthServiceBase from './pay-trade-auth-service-base';
 
 
 /**
- * 支付交易权限服务对象
+ * 支付交易1权限服务对象
  *
  * @export
  * @class PayTradeAuthService

app_web/src/locale/lanres/entities/pay-trade/pay-trade_en_US.ts

@@ -14,11 +14,11 @@ export default {
   },
 	views: {
 		editview: {
-			caption: "支付交易",
+			caption: "支付交易1",
       		title: "支付交易编辑视图",
 		},
 		gridview: {
-			caption: "支付交易",
+			caption: "支付交易1",
       		title: "支付交易表格视图",
 		},
 	},

app_web/src/locale/lanres/entities/pay-trade/pay-trade_zh_CN.ts

@@ -13,11 +13,11 @@ export default {
   },
 	views: {
 		editview: {
-			caption: "支付交易",
+			caption: "支付交易1",
       		title: "支付交易编辑视图",
 		},
 		gridview: {
-			caption: "支付交易",
+			caption: "支付交易1",
       		title: "支付交易表格视图",
 		},
 	},

app_web/src/mock/viewconfig/viewconfig.ts

@@ -9,7 +9,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
     return [status,{
                 "paytradeeditview": {
             "title": "支付交易编辑视图",
-            "caption": "支付交易",
+            "caption": "支付交易1",
             "viewtype": "DEEDITVIEW",
             "viewmodule": "pay",
             "viewname": "PayTradeEditView",
@@ -17,7 +17,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
         },
         "paytradegridview": {
             "title": "支付交易表格视图",
-            "caption": "支付交易",
+            "caption": "支付交易1",
             "viewtype": "DEGRIDVIEW",
             "viewmodule": "pay",
             "viewname": "PayTradeGridView",

app_web/src/service/pay-trade/pay-trade-service-base.ts

@@ -4,7 +4,7 @@ import EntityService from '../entity-service';
 
 
 /**
- * 支付交易服务对象基类
+ * 支付交易1服务对象基类
  *
  * @export
  * @class PayTradeServiceBase

app_web/src/service/pay-trade/pay-trade-service.ts

@@ -3,7 +3,7 @@ import PayTradeServiceBase from './pay-trade-service-base';
 
 
 /**
- * 支付交易服务对象
+ * 支付交易1服务对象
  *
  * @export
  * @class PayTradeService

app_web/src/uiservice/pay-trade/pay-trade-ui-service-base.ts

@@ -6,7 +6,7 @@ import PayTradeService from '@/service/pay-trade/pay-trade-service';
 import PayTradeAuthService from '@/authservice/pay-trade/pay-trade-auth-service';
 
 /**
- * 支付交易UI服务对象基类
+ * 支付交易1UI服务对象基类
  *
  * @export
  * @class PayTradeUIServiceBase

app_web/src/uiservice/pay-trade/pay-trade-ui-service.ts

 import PayTradeUIServiceBase from './pay-trade-ui-service-base';
 
 /**
- * 支付交易UI服务对象
+ * 支付交易1UI服务对象
  *
  * @export
  * @class PayTradeUIService

app_web/src/widgets/pay-trade/default-searchform/default-searchform-service.ts

@@ -13,7 +13,7 @@ import DefaultModel from './default-searchform-model';
 export default class DefaultService extends ControlService {
 
     /**
-     * 支付交易服务对象
+     * 支付交易1服务对象
      *
      * @type {PayTradeService}
      * @memberof DefaultService

app_web/src/widgets/pay-trade/main-form/main-form-service.ts

@@ -14,7 +14,7 @@ import PayOpenAccessService from '@/service/pay-open-access/pay-open-access-serv
 export default class MainService extends ControlService {
 
     /**
-     * 支付交易服务对象
+     * 支付交易1服务对象
      *
      * @type {PayTradeService}
      * @memberof MainService

app_web/src/widgets/pay-trade/main-grid/main-grid-base.vue

@@ -1016,7 +1016,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 excel.export_json_to_excel({
                   header: tHeader, //表头 必填
                   data, //具体数据 必填
-                  filename: "支付交易"+(this.$t('app.gridpage.grid') as string), //非必填
+                  filename: "支付交易1"+(this.$t('app.gridpage.grid') as string), //非必填
                   autoWidth: true, //非必填
                   bookType: "xlsx" //非必填
                 });

app_web/src/widgets/pay-trade/main-grid/main-grid-service.ts

@@ -13,7 +13,7 @@ import MainModel from './main-grid-model';
 export default class MainService extends ControlService {
 
     /**
-     * 支付交易服务对象
+     * 支付交易1服务对象
      *
      * @type {PayTradeService}
      * @memberof MainService

ibzpay-core/src/main/java/cn/ibizlab/core/pay/domain/PayTrade.java

@@ -30,7 +30,7 @@ import cn.ibizlab.util.domain.EntityMP;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 
 /**
- * 实体[支付交易]
+ * 实体[支付交易1]
  */
 @Getter
 @Setter

ibzpay-core/src/main/java/cn/ibizlab/core/pay/service/impl/PayTradeServiceImpl.java

@@ -40,7 +40,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.springframework.util.StringUtils;
 
 /**
- * 实体[支付交易] 服务对象接口实现
+ * 实体[支付交易1] 服务对象接口实现
  */
 @Slf4j
 @Service("PayTradeServiceImpl")

ibzpay-core/src/main/resources/liquibase/h2_table.xml

@@ -34,7 +34,7 @@
 
 
     <!--输出实体[PAY_TRADE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-pay_trade-4-2">
+    <changeSet author="a_A_5d9d78509" id="tab-pay_trade-6-2">
         <createTable tableName="IBZPAYTRADE">
                 <column name="SUBJECT" remarks="" type="VARCHAR(100)">
                 </column>

ibzpay-core/src/main/resources/permission/systemResource.json

@@ -5,7 +5,7 @@
     "entities":[
     {
     "dename":"PayTrade",
-    "delogicname":"支付交易",
+    "delogicname":"支付交易1",
     "sysmoudle":{"id":"PAY","name":"pay"},
     "dedataset":[{"id":"Default" , "name":"数据集"}],
     "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],

ibzpay-provider/ibzpay-provider-api/src/main/java/cn/ibizlab/api/rest/PayTradeResource.java

@@ -34,7 +34,7 @@ import cn.ibizlab.core.pay.filter.PayTradeSearchContext;
 import cn.ibizlab.util.annotation.VersionCheck;
 
 @Slf4j
-@Api(tags = {"支付交易" })
+@Api(tags = {"支付交易1" })
 @RestController("api-paytrade")
 @RequestMapping("")
 public class PayTradeResource {
@@ -47,7 +47,7 @@ public class PayTradeResource {
     public PayTradeMapping paytradeMapping;
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Create-all')")
-    @ApiOperation(value = "新建支付交易", tags = {"支付交易" },  notes = "新建支付交易")
+    @ApiOperation(value = "新建支付交易1", tags = {"支付交易1" },  notes = "新建支付交易1")
 	@RequestMapping(method = RequestMethod.POST, value = "/paytrades")
     public ResponseEntity<PayTradeDTO> create(@RequestBody PayTradeDTO paytradedto) {
         PayTrade domain = paytradeMapping.toDomain(paytradedto);
@@ -57,7 +57,7 @@ public class PayTradeResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Create-all')")
-    @ApiOperation(value = "批量新建支付交易", tags = {"支付交易" },  notes = "批量新建支付交易")
+    @ApiOperation(value = "批量新建支付交易1", tags = {"支付交易1" },  notes = "批量新建支付交易1")
 	@RequestMapping(method = RequestMethod.POST, value = "/paytrades/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<PayTradeDTO> paytradedtos) {
         paytradeService.createBatch(paytradeMapping.toDomain(paytradedtos));
@@ -65,7 +65,7 @@ public class PayTradeResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Update-all')")
-    @ApiOperation(value = "更新支付交易", tags = {"支付交易" },  notes = "更新支付交易")
+    @ApiOperation(value = "更新支付交易1", tags = {"支付交易1" },  notes = "更新支付交易1")
 	@RequestMapping(method = RequestMethod.PUT, value = "/paytrades/{paytrade_id}")
     public ResponseEntity<PayTradeDTO> update(@PathVariable("paytrade_id") String paytrade_id, @RequestBody PayTradeDTO paytradedto) {
 		PayTrade domain  = paytradeMapping.toDomain(paytradedto);
@@ -76,7 +76,7 @@ public class PayTradeResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Update-all')")
-    @ApiOperation(value = "批量更新支付交易", tags = {"支付交易" },  notes = "批量更新支付交易")
+    @ApiOperation(value = "批量更新支付交易1", tags = {"支付交易1" },  notes = "批量更新支付交易1")
 	@RequestMapping(method = RequestMethod.PUT, value = "/paytrades/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<PayTradeDTO> paytradedtos) {
         paytradeService.updateBatch(paytradeMapping.toDomain(paytradedtos));
@@ -84,14 +84,14 @@ public class PayTradeResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Remove-all')")
-    @ApiOperation(value = "删除支付交易", tags = {"支付交易" },  notes = "删除支付交易")
+    @ApiOperation(value = "删除支付交易1", tags = {"支付交易1" },  notes = "删除支付交易1")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/paytrades/{paytrade_id}")
     public ResponseEntity<Boolean> remove(@PathVariable("paytrade_id") String paytrade_id) {
          return ResponseEntity.status(HttpStatus.OK).body(paytradeService.remove(paytrade_id));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Remove-all')")
-    @ApiOperation(value = "批量删除支付交易", tags = {"支付交易" },  notes = "批量删除支付交易")
+    @ApiOperation(value = "批量删除支付交易1", tags = {"支付交易1" },  notes = "批量删除支付交易1")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/paytrades/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
         paytradeService.removeBatch(ids);
@@ -99,7 +99,7 @@ public class PayTradeResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Get-all')")
-    @ApiOperation(value = "获取支付交易", tags = {"支付交易" },  notes = "获取支付交易")
+    @ApiOperation(value = "获取支付交易1", tags = {"支付交易1" },  notes = "获取支付交易1")
 	@RequestMapping(method = RequestMethod.GET, value = "/paytrades/{paytrade_id}")
     public ResponseEntity<PayTradeDTO> get(@PathVariable("paytrade_id") String paytrade_id) {
         PayTrade domain = paytradeService.get(paytrade_id);
@@ -107,27 +107,27 @@ public class PayTradeResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @ApiOperation(value = "获取支付交易草稿", tags = {"支付交易" },  notes = "获取支付交易草稿")
+    @ApiOperation(value = "获取支付交易1草稿", tags = {"支付交易1" },  notes = "获取支付交易1草稿")
 	@RequestMapping(method = RequestMethod.GET, value = "/paytrades/getdraft")
     public ResponseEntity<PayTradeDTO> getDraft() {
         return ResponseEntity.status(HttpStatus.OK).body(paytradeMapping.toDto(paytradeService.getDraft(new PayTrade())));
     }
 
-    @ApiOperation(value = "检查支付交易", tags = {"支付交易" },  notes = "检查支付交易")
+    @ApiOperation(value = "检查支付交易1", tags = {"支付交易1" },  notes = "检查支付交易1")
 	@RequestMapping(method = RequestMethod.POST, value = "/paytrades/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody PayTradeDTO paytradedto) {
         return  ResponseEntity.status(HttpStatus.OK).body(paytradeService.checkKey(paytradeMapping.toDomain(paytradedto)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Save-all')")
-    @ApiOperation(value = "保存支付交易", tags = {"支付交易" },  notes = "保存支付交易")
+    @ApiOperation(value = "保存支付交易1", tags = {"支付交易1" },  notes = "保存支付交易1")
 	@RequestMapping(method = RequestMethod.POST, value = "/paytrades/save")
     public ResponseEntity<Boolean> save(@RequestBody PayTradeDTO paytradedto) {
         return ResponseEntity.status(HttpStatus.OK).body(paytradeService.save(paytradeMapping.toDomain(paytradedto)));
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-Save-all')")
-    @ApiOperation(value = "批量保存支付交易", tags = {"支付交易" },  notes = "批量保存支付交易")
+    @ApiOperation(value = "批量保存支付交易1", tags = {"支付交易1" },  notes = "批量保存支付交易1")
 	@RequestMapping(method = RequestMethod.POST, value = "/paytrades/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<PayTradeDTO> paytradedtos) {
         paytradeService.saveBatch(paytradeMapping.toDomain(paytradedtos));
@@ -135,7 +135,7 @@ public class PayTradeResource {
     }
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-searchDefault-all')")
-	@ApiOperation(value = "获取数据集", tags = {"支付交易" } ,notes = "获取数据集")
+	@ApiOperation(value = "获取数据集", tags = {"支付交易1" } ,notes = "获取数据集")
     @RequestMapping(method= RequestMethod.GET , value="/paytrades/fetchdefault")
 	public ResponseEntity<List<PayTradeDTO>> fetchDefault(PayTradeSearchContext context) {
         Page<PayTrade> domains = paytradeService.searchDefault(context) ;
@@ -148,7 +148,7 @@ public class PayTradeResource {
 	}
 
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzpay-PayTrade-searchDefault-all')")
-	@ApiOperation(value = "查询数据集", tags = {"支付交易" } ,notes = "查询数据集")
+	@ApiOperation(value = "查询数据集", tags = {"支付交易1" } ,notes = "查询数据集")
     @RequestMapping(method= RequestMethod.POST , value="/paytrades/searchdefault")
 	public ResponseEntity<Page<PayTradeDTO>> searchDefault(@RequestBody PayTradeSearchContext context) {
         Page<PayTrade> domains = paytradeService.searchDefault(context) ;