shiro权限控制bug

区分收银机接口和钉钉接口

dininghall/app.js

@@ -3,10 +3,10 @@ App({
     userId: '',
     userBalance: '',
     refreshFlag:false,
-    host: '192.168.0.200:8180',
-    baseUrl: 'http://192.168.0.200:8180',
-    // host: '121.236.175.200:8180',
-    // baseUrl: 'http://121.236.175.200:8180',
+    // host: '192.168.0.200:8180',
+    // baseUrl: 'http://192.168.0.200:8180',
+    host: '121.236.175.200:8180',
+    baseUrl: 'http://121.236.175.200:8180',
   },
   onLaunch(options) {
     //获取用户信息

dininghall/pages/index/bill/bill.js

@@ -7,7 +7,7 @@ Page({
   },
   list() {
     var app = getApp()
-    app.requestHps('/system/dingUser/getConsumeList', { userId: app.data.userId.userid }).then(res => {
+    app.requestHps('/system/dingUser/ding/getConsumeList', { userId: app.data.userId.userid }).then(res => {
       if (res.data.code == 0) {
         this.setData({
           list: res.data.data

dininghall/pages/index/bill/expenditure/expenditure.js

@@ -4,7 +4,7 @@ Page({
   },
   onLoad(options) {
     var app = getApp()
-    app.requestHps('/system/dingUser/getConsumeDetails', { orderId: options.id }).then(res => {
+    app.requestHps('/system/dingUser/ding/getConsumeDetails', { orderId: options.id }).then(res => {
       if (res.data.code == 0) {
         this.setData({
           content: res.data.data

dininghall/pages/index/personal-wallet/binding/binding.js

@@ -10,7 +10,7 @@ Page({
     var data = {
       userid: app.data.userId.userid
     }
-    app.requestHp('/system/dingUser/alipaySignup', JSON.stringify(data)).then(res => {
+    app.requestHp('/system/dingUser/ding/alipaySignup', JSON.stringify(data)).then(res => {
       this.setData({
         path: res.data.msg
       })

dininghall/pages/index/personal-wallet/personal-wallet.js

@@ -27,7 +27,7 @@ Page({
     let data = {
       userId: app.data.userId.userid
     }
-    app.requestHp('/system/dingUser/personalDetailed', JSON.stringify(data)).then(res => {
+    app.requestHp('/system/dingUser/ding/personalDetailed', JSON.stringify(data)).then(res => {
       if (res.data.code == 0) {
         this.setData({
           walletDetail: res.data.data

dininghall/pages/index/rechargeDel/rechargeDel.js

@@ -4,7 +4,7 @@ Page({
   },
   onLoad(options) {
     var app = getApp()
-    app.requestHps('/system/dingUser/getRechargeDetails', { rechargeId: options.id }).then(res => {
+    app.requestHps('/system/dingUser/ding/getRechargeDetails', { rechargeId: options.id }).then(res => {
       if (res.data.code == 0) {
         this.setData({
           content: res.data.data

dininghall/pages/index/release-record/release-record.js

@@ -29,7 +29,7 @@ Page({
       type: 2
     }
     //餐贴到账记录列表
-    app.requestHp('/system/dingUser/getSubsidyRechargeRecord', JSON.stringify(data)).then(res => {
+    app.requestHp('/system/dingUser/ding/getSubsidyRechargeRecord', JSON.stringify(data)).then(res => {
       if (res.data.code == 0) {
         var str = res.data.data[0].createTime
         this.setData({

dininghall/pages/index/report/relieve/relieve.js

@@ -30,7 +30,7 @@ Page({
     });
     var app = getApp()
     //查询挂失信息
-    app.requestHps('/system/dingUser/getReportCard', { userId: app.data.userId.userid }).then(res => {
+    app.requestHps('/system/dingUser/ding/getReportCard', { userId: app.data.userId.userid }).then(res => {
       if (res.data.code == 0) {
         this.setData({
           getReportCard: res.data.data
@@ -55,7 +55,7 @@ Page({
             userCard: this.data.workCard.card,
             reportId: this.data.getReportCard.reportId
           }
-          app.requestHp('/system/dingUser/unReportCard', JSON.stringify(data)).then(res => {
+          app.requestHp('/system/dingUser/ding/unReportCard', JSON.stringify(data)).then(res => {
             if (res.data.code == 0) {
               dd.alert({
                 content: '工牌已解除挂失',

dininghall/pages/index/report/report.js

@@ -51,7 +51,7 @@ Page({
             userCard: this.data.card,
             reson: this.data.reson
           }
-          app.requestHp('/system/dingUser/reportCard', JSON.stringify(data)).then(res => {
+          app.requestHp('/system/dingUser/ding/reportCard', JSON.stringify(data)).then(res => {
             dd.redirectTo({ url: '/pages/index/report/relieve/relieve' })
           })
         }

dininghall/pages/tabber/wallet/wallet.js

@@ -92,7 +92,7 @@ Page({
               dd.offSocketMessage();
             })
             //公司钱包金额
-            app.requestHps('/system/dingUser/getSubsidyBalance', { userId: res.data.data.userid }).then(res => {
+            app.requestHps('/system/dingUser/ding/getSubsidyBalance', { userId: res.data.data.userid }).then(res => {
               if (res.data.code == 0) {
                 that.data.wallet = res.data.data
                 //判断余额是否为0
@@ -120,7 +120,7 @@ Page({
                 var data = {
                   userid: app.data.userId.userid
                 }
-                app.requestHp('/system/dingUser/getEncryptCode', JSON.stringify(data)).then(res => {
+                app.requestHp('/system/dingUser/ding/getEncryptCode', JSON.stringify(data)).then(res => {
                   if (res.data.code == 0) {
                     //生成二维码
                     let scale = that.data.systemInfo.windowWidth / 375; //不同屏幕下QRcode的适配比例；设计稿是750宽
@@ -188,7 +188,7 @@ Page({
   skipreport() {
     //判断工牌是否挂失
     var app = getApp()
-    app.requestHps('/system/dingUser/getReportCard', { userId: app.data.userId.userid }).then(res => {
+    app.requestHps('/system/dingUser/ding/getReportCard', { userId: app.data.userId.userid }).then(res => {
       if (res.data.data) {
         dd.navigateTo({ url: '/pages/index/report/relieve/relieve' })
       } else {
@@ -220,7 +220,7 @@ Page({
     var data = {
       userId: that.data.userId.userid
     }
-    app.requestHp('/system/dingUser/personalBalance', JSON.stringify(data)).then(res => {
+    app.requestHp('/system/dingUser/ding/personalBalance', JSON.stringify(data)).then(res => {
       if (res.data.code == 0) {
         that.data.userBalance = res.data.data
         if (that.data.userBalance) {
@@ -246,7 +246,7 @@ Page({
   },
   unbundle() {
     var that = this
-    app.requestHp('/system/dingUser/removeZFB', {ids: this.data.id}).then(res => {
+    app.requestHp('/system/dingUser/ding/removeZFB', {id: this.data.id}).then(res => {
       if (res.data.code == 0) {
         dd.alert({
             content: '解绑成功',