From 913e88c3eaf3efbd2f3edbfbae82ecb7b2854b3b Mon Sep 17 00:00:00 2001 From: biexiande Date: Thu, 21 Nov 2024 11:50:05 +0800 Subject: [PATCH 1/7] =?UTF-8?q?banboocloud=20=E6=94=B9=E4=B8=BA=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0maven=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RuoYi-Vue-Oracle/pom.xml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/RuoYi-Vue-Oracle/pom.xml b/RuoYi-Vue-Oracle/pom.xml index 9127845..4b83370 100644 --- a/RuoYi-Vue-Oracle/pom.xml +++ b/RuoYi-Vue-Oracle/pom.xml @@ -342,15 +342,6 @@ ${velocity.version} - - - com.banboocloud - banboocloudCodec - 1.0 - system - ${project.basedir}/src/main/java/com/ruoyi/project/system/lib/banboocloud_Codec-0.0.jar - - org.quartz-scheduler @@ -386,7 +377,8 @@ spring-boot-maven-plugin true - + true + From 94d56d71be6d7d285a7018375e647cf2c4343e98 Mon Sep 17 00:00:00 2001 From: LokerL Date: Sun, 24 Nov 2024 18:21:49 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E2=9C=A8=20feat:=20=E6=B7=BB=E5=8A=A0sso?= =?UTF-8?q?=20redirect=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/permission.js | 2 +- ruoyi-ui/src/router/index.js | 5 +++++ ruoyi-ui/src/views/login-redirect.vue | 24 ++++++++++++++++++++++++ ruoyi-ui/src/views/login-sso.vue | 6 ------ 4 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 ruoyi-ui/src/views/login-redirect.vue diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index 5abf76a..228d79d 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/register', '/LoginSso'] +const whiteList = ['/login', '/register', '/LoginSso', '/LoginRedirect'] router.beforeEach((to, from, next) => { NProgress.start() diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 6219c15..0e16abd 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -51,6 +51,11 @@ export const constantRoutes = [ component: () => import('@/views/login-sso'), hidden: true }, + { + path: '/LoginRedirect', + component: () => import('@/views/login-redirect'), + hidden: true + }, { path: '/register', component: () => import('@/views/register'), diff --git a/ruoyi-ui/src/views/login-redirect.vue b/ruoyi-ui/src/views/login-redirect.vue new file mode 100644 index 0000000..efd50e4 --- /dev/null +++ b/ruoyi-ui/src/views/login-redirect.vue @@ -0,0 +1,24 @@ + +​ + diff --git a/ruoyi-ui/src/views/login-sso.vue b/ruoyi-ui/src/views/login-sso.vue index 4221c3f..2844dfc 100644 --- a/ruoyi-ui/src/views/login-sso.vue +++ b/ruoyi-ui/src/views/login-sso.vue @@ -7,11 +7,6 @@ export default { name: "LoginSso", data() { return { - loginRules: {}, - //验证码开关 - captchaOnOff: true, - //注册开关 - register: false, //重定向 redirect: undefined }; @@ -24,7 +19,6 @@ export default { loginSso() { //获取地址栏中的code const code = this.$route.query.code; - console.log("code="+code) //调用登录的接口 if(code==''||code==undefined||code==null){ //请求中不带code，拦截为正常登录 From 1b5cca52caa7177f258b0dcfab5b24a16b223de2 Mon Sep 17 00:00:00 2001 From: LokerL Date: Sun, 24 Nov 2024 18:37:24 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E4=BC=98=E5=8C=96log?= =?UTF-8?q?in-redirect=EF=BC=9B=E6=B7=BB=E5=8A=A0redirectToAuth=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/login.js | 8 ++++++++ ruoyi-ui/src/views/login-redirect.vue | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js index 85e9b82..af2a88c 100644 --- a/ruoyi-ui/src/api/login.js +++ b/ruoyi-ui/src/api/login.js @@ -66,3 +66,11 @@ export function getAccountName(data) { params: data }) } + +export function redirectToAuth(data) { + return request({ + url: '/redirectToAuth', + method: 'get', + params: data + }) +} diff --git a/ruoyi-ui/src/views/login-redirect.vue b/ruoyi-ui/src/views/login-redirect.vue index efd50e4..5bf769c 100644 --- a/ruoyi-ui/src/views/login-redirect.vue +++ b/ruoyi-ui/src/views/login-redirect.vue @@ -9,7 +9,7 @@ export default { return { authorizeUrl: "https://iam.sd-port.com:18010/idp/oauth2/authorize", clientId: "hfxyjwzxjc", - redirectUri: "http://10.167.96.13/prod-api/redirectToAuth&response_type=code&state=123", + redirectUri: `${window.location.origin}/prod-api/redirectToAuth&response_type=code&state=123`, }; }, created() { @@ -17,7 +17,7 @@ export default { }, methods: { loginRedirect() { - window.location = `${this.authorizeUrl}?client_id=${this.clientId}&redirect_uri=${this.redirectUri}` + window.location = `${this.authorizeUrl}?client_id=${this.clientId}&redirect_uri=${this.redirectUri}`; }, } }; From 21cbb63052c450f531da087ff8d6c9b775931cf2 Mon Sep 17 00:00:00 2001 From: LokerL Date: Mon, 25 Nov 2024 15:11:39 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E2=9C=A8=20feat:=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=96=B0=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9B=E6=96=B0=E5=A2=9EsingleSign=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=8A=E7=9B=B8=E5=85=B3=E8=B7=AF=E7=94=B1=E5=92=8C=E8=A7=86?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/login.js | 12 ++++++++++++ ruoyi-ui/src/permission.js | 2 +- ruoyi-ui/src/router/index.js | 5 +++++ ruoyi-ui/src/store/modules/user.js | 17 ++++++++++++++++- ruoyi-ui/src/views/single-sign.vue | 27 +++++++++++++++++++++++++++ 5 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 ruoyi-ui/src/views/single-sign.vue diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js index af2a88c..53de8a9 100644 --- a/ruoyi-ui/src/api/login.js +++ b/ruoyi-ui/src/api/login.js @@ -19,6 +19,18 @@ export function login(username, password, code, uuid) { }) } +export function singleSign(username, password) { + return request({ + url: '/singleSign', + headers: { + isToken: false, + repeatSubmit: false + }, + method: 'post', + data: { username, password } + }) +} + // 注册方法 export function register(data) { return request({ diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index 228d79d..23ba4a3 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/register', '/LoginSso', '/LoginRedirect'] +const whiteList = ['/login', '/register', '/LoginSso', '/LoginRedirect', '/SingleSign'] router.beforeEach((to, from, next) => { NProgress.start() diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 0e16abd..7fe43c1 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -51,6 +51,11 @@ export const constantRoutes = [ component: () => import('@/views/login-sso'), hidden: true }, + { + path: '/SingleSign', + component: () => import('@/views/single-sign'), + hidden: true + }, { path: '/LoginRedirect', component: () => import('@/views/login-redirect'), diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js index d24810a..b32e9ef 100644 --- a/ruoyi-ui/src/store/modules/user.js +++ b/ruoyi-ui/src/store/modules/user.js @@ -1,4 +1,4 @@ -import { login, logout, getInfo, getAccountName } from '@/api/login' +import { login, logout, getInfo, getAccountName, singleSign } from '@/api/login' import { getToken, setToken, removeToken } from '@/utils/auth' import {encrypt, decrypt} from '@/utils/secret' const user = { @@ -51,6 +51,21 @@ const user = { }) }, + SingleSign({ commit }, userInfo) { + const username = userInfo.username.trim(); + const password = userInfo.password; + let encodePs = encrypt(password)//加密 + return new Promise((resolve, reject) => { + singleSign(username, encodePs).then(res => { + setToken(res.token) + commit('SET_TOKEN', res.token) + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + // 获取用户信息 GetInfo({ commit, state }) { return new Promise((resolve, reject) => { diff --git a/ruoyi-ui/src/views/single-sign.vue b/ruoyi-ui/src/views/single-sign.vue new file mode 100644 index 0000000..0a973ea --- /dev/null +++ b/ruoyi-ui/src/views/single-sign.vue @@ -0,0 +1,27 @@ + +​ + From a2ceabb9e9ad9b2cd8ff7b395d1049f097769ddf Mon Sep 17 00:00:00 2001 From: LokerL Date: Tue, 26 Nov 2024 13:42:45 +0800 Subject: [PATCH 5/7] =?UTF-8?q?SingleSign=E6=8E=A5=E5=8F=A3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/store/modules/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js index b32e9ef..ebb362c 100644 --- a/ruoyi-ui/src/store/modules/user.js +++ b/ruoyi-ui/src/store/modules/user.js @@ -52,7 +52,7 @@ const user = { }, SingleSign({ commit }, userInfo) { - const username = userInfo.username.trim(); + const username = userInfo.userName.trim(); const password = userInfo.password; let encodePs = encrypt(password)//加密 return new Promise((resolve, reject) => { From 43e291dd5212fa88a6d1fb232ca7154cb8f7a390 Mon Sep 17 00:00:00 2001 From: LokerL Date: Wed, 27 Nov 2024 13:50:12 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E4=BC=98=E5=8C=96sin?= =?UTF-8?q?gleSign=E6=96=B9=E6=B3=95=EF=BC=9B=E7=A1=AE=E4=BF=9D=E6=97=A0?= =?UTF-8?q?=E8=AE=BA=E6=88=90=E5=8A=9F=E4=B8=8E=E5=90=A6=E9=83=BD=E8=83=BD?= =?UTF-8?q?=E9=87=8D=E5=AE=9A=E5=90=91=E5=88=B0=E4=B8=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/single-sign.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ruoyi-ui/src/views/single-sign.vue b/ruoyi-ui/src/views/single-sign.vue index 0a973ea..f15a1f3 100644 --- a/ruoyi-ui/src/views/single-sign.vue +++ b/ruoyi-ui/src/views/single-sign.vue @@ -16,10 +16,8 @@ export default { methods: { singleSign() { const { userName, password = "123456" } = this.$route.query; - this.$store.dispatch("SingleSign", { userName, password }).then(() => { - this.$router.push({ path: this.redirect || "/" }).catch(()=>{}); - }).catch((error) => { - console.error(error); + this.$store.dispatch("SingleSign", { userName, password }).finally(() => { + this.$router.push({ path: "/" }).catch(()=>{}); }); }, } From 326bbe829606a9bc2340e5464ccd6ea5b2975a6d Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Mon, 2 Dec 2024 14:15:39 +0800 Subject: [PATCH 7/7] 11 --- .../ruoyi/project/oil/controller/OilMonitorController.java | 2 +- .../java/com/ruoyi/project/oil/mapper/OilMonitorMapper.java | 2 +- .../com/ruoyi/project/oil/service/IOilMonitorService.java | 2 +- .../project/oil/service/impl/OilMonitorServiceImpl.java | 2 +- .../project/outside/service/impl/OutSideServiceImpl.java | 1 + .../src/main/resources/mybatis/oil/OilMonitorMapper.xml | 6 ++---- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/controller/OilMonitorController.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/controller/OilMonitorController.java index 323e12d..704cf6f 100644 --- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/controller/OilMonitorController.java +++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/controller/OilMonitorController.java @@ -72,7 +72,7 @@ public class OilMonitorController extends BaseController { */ @Log(title = "密封点", businessType = BusinessType.DELETE) @GetMapping("/delete/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { + public AjaxResult remove(@PathVariable Long ids) { return toAjax(oilMonitorService.deleteOilMonitorByIds(ids)); } diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/OilMonitorMapper.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/OilMonitorMapper.java index 0fa096c..6e988b6 100644 --- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/OilMonitorMapper.java +++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/mapper/OilMonitorMapper.java @@ -38,7 +38,7 @@ public interface OilMonitorMapper { * 删除 * @param ids */ - void deleteOilMonitorByIds(@Param("ids") Long[] ids); + void deleteOilMonitorByIds(@Param("ids") Long ids); /** * 获取检测地图 diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/IOilMonitorService.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/IOilMonitorService.java index f91de0b..1108416 100644 --- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/IOilMonitorService.java +++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/IOilMonitorService.java @@ -18,7 +18,7 @@ public interface IOilMonitorService { int updateOilMonitor(OilMonitor oilMonitor); - int deleteOilMonitorByIds(Long[] ids); + int deleteOilMonitorByIds(Long ids); /** * 查询检测设备地图列表 diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilMonitorServiceImpl.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilMonitorServiceImpl.java index 1f2f000..dd40294 100644 --- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilMonitorServiceImpl.java +++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/OilMonitorServiceImpl.java @@ -49,7 +49,7 @@ public class OilMonitorServiceImpl implements IOilMonitorService { } @Override - public int deleteOilMonitorByIds(Long[] ids) { + public int deleteOilMonitorByIds(Long ids) { oilMonitorMapper.deleteOilMonitorByIds(ids); return 1; } diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/outside/service/impl/OutSideServiceImpl.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/outside/service/impl/OutSideServiceImpl.java index 407a56c..e197908 100644 --- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/outside/service/impl/OutSideServiceImpl.java +++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/outside/service/impl/OutSideServiceImpl.java @@ -83,6 +83,7 @@ public class OutSideServiceImpl implements OutSideService { if (rootNode.isArray()) { for (JsonNode node : rootNode) { SensorData sd = insertOldData(node); + outSideMapper.insertDevice(sd); } } else { diff --git a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml index 0413d70..7068642 100644 --- a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml +++ b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml @@ -153,10 +153,8 @@ select t.id,t. name,t.unit_no,t.system_no,t.status,t.sn,t.file_url,t.note,t.crea - delete from th_device where id in - - #{id} - + delete from th_device where id = #{id} +