Procházet zdrojové kódy

Merge branch 'bgy' of SH-Arbitrate/Arbitrate-Backend into dev

bgy před 2 roky
rodič
revize
cf73d6e338

+ 1
- 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java Zobrazit soubor

46
      * @return
46
      * @return
47
      */
47
      */
48
     @GetMapping("/logistics")
48
     @GetMapping("/logistics")
49
-    @PreAuthorize("@ss.hasPermi('delivery:detail')")
49
+//    @PreAuthorize("@ss.hasPermi('delivery:detail')")
50
     public AjaxResult  getLogisticsInfo(CaseApplication caseApplication){
50
     public AjaxResult  getLogisticsInfo(CaseApplication caseApplication){
51
         List<LogisticsInfoVO> logisticsInfo = adjudicationService.getLogisticsInfo(caseApplication);
51
         List<LogisticsInfoVO> logisticsInfo = adjudicationService.getLogisticsInfo(caseApplication);
52
         return AjaxResult.success(logisticsInfo);
52
         return AjaxResult.success(logisticsInfo);

+ 1
- 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java Zobrazit soubor

30
     /**
30
     /**
31
      * 查询立案数据
31
      * 查询立案数据
32
      */
32
      */
33
-    @PreAuthorize("@ss.hasPermi('caseManagement:list')")
33
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list')")
34
     @GetMapping("/list")
34
     @GetMapping("/list")
35
     public TableDataInfo list(CaseApplication caseApplication) {
35
     public TableDataInfo list(CaseApplication caseApplication) {
36
         startPage();
36
         startPage();

+ 2
- 2
ruoyi-admin/src/main/resources/application-druid.yml Zobrazit soubor

6
         druid:
6
         druid:
7
             # 主库数据源
7
             # 主库数据源
8
             master:
8
             master:
9
-                url: jdbc:mysql://121.40.189.20:3306/arbitrate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
9
+                url: jdbc:mysql://121.40.189.20:3306/smart_arbitration?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
10
                 username: root
10
                 username: root
11
-                password: root123456
11
+                password: YMzc157#
12
             # 从库数据源
12
             # 从库数据源
13
             slave:
13
             slave:
14
                 # 从数据源开关/默认关闭
14
                 # 从数据源开关/默认关闭