が HTML 中に存在しません',
- "fatal.noXMLHttpRequest": "ブラウザが XMLHttpRequest をサポートしていないので IdP 情報を取得できません",
- "fatal.wrongProtocol": 'DSへ渡された Policy パラメータが "urn:oasis:names:tc:SAML:profiles:SSO:idpdiscovery-protocol:single" ではありません',
- "fatal.wrongEntityId": "SP から渡された entityId が設定値と異なります",
- "fatal.noData": "メタデータが空です",
- "fatal.loadFailed": "次の URL からメタデータをダウンロードできませんでした: ",
- "fatal.noparms": "DSにパラメータが渡されておらず defaultReturn も設定されていません",
- "fatal.noReturnURL": "戻り URL が指定されていません",
- "fatal.badProtocol": "戻り URL は https:// か http:// で始まらなければなりません",
- "idpPreferred.label": "選択候補の IdP:",
- "idpEntry.label": "もしくはあなたの所属機関名を入力してください",
- "idpEntry.NoPreferred.label": "あなたの所属機関名を入力してください",
- "idpList.label": "もしくはあなたの所属機関を選択してください",
- "idpList.NoPreferred.label": "あなたの所属機関を一覧から選択してください",
- "idpList.defaultOptionLabel": "所属機関を選択してください...",
- "idpList.showList": "一覧から選択する",
- "idpList.showSearch": "機関名を入力する",
- "submitButton.label": "選択",
- "autoFollow.message": "次の期間選択した機関に自動的に遷移する:",
- "autoFollow.never": "自動遷移しない",
- "autoFollow.time0": "1日",
- "autoFollow.time1": "3か月",
- "autoFollow.time2": "9か月",
- helpText: "Help",
- defaultLogoAlt: "DefaultLogo"
- }, "pt-br": {
- "fatal.divMissing": 'A tag
com "insertAtDiv" não foi encontrada no arquivo HTML',
- "fatal.noXMLHttpRequest": 'Seu navegador não suporta "XMLHttpRequest", impossível de carregador os dados do IdP selecionado',
- "fatal.wrongProtocol": 'A política "Policy" fornecida para o DS não foi "urn:oasis:names:tc:SAML:profiles:SSO:idpdiscovery-protocol:single"',
- "fatal.wrongEntityId": "entityId oferecido pelo SP não confere com o da configuração",
- "fatal.noData": "O arquivo de metadados não retornou nada;",
- "fatal.loadFailed": "Falhou ao realizar download do metadado de ",
- "fatal.noparms": 'Sem parâmetros para sessão de descoberta e sem parâmetro "defaultReturn" configurado',
- "fatal.noReturnURL": "Não foi definida um endereço (URL) de retorno no parâmetro",
- "fatal.badProtocol": "Retorno do endereço requisitado deve começar com https:// ou http://",
- "idpPreferred.label": "Use estas Instituições sugeridas: ",
- "idpEntry.label": "Ou informe o nome da sua Instituição",
- "idpEntry.NoPreferred.label": "Informe o nome da sua Instituição",
- "idpList.label": "Ou selecione sua Instituição através da lista abaixo",
- "idpList.NoPreferred.label": "Selecione sua Instituição através da lista abaixo",
- "idpList.defaultOptionLabel": "Por favor, selecione sua Instituição: ",
- "idpList.showList": "Permitir que eu escolha um IdP através de uma lista",
- "idpList.showSearch": "Permitir que eu especifique o IdP",
- "submitButton.label": "Continuar ",
- helpText: "Ajuda",
- defaultLogoAlt: "Logo padrão"
- }
- }
-}
-
-function TypeAheadControl(l, f, j, g, i, b, h, e, a, c, d, k) {
- this.elementList = l;
- this.textBox = f;
- this.origin = j;
- this.submit = g;
- this.results = 0;
- this.alwaysShow = c;
- this.maxResults = d;
- this.ie6hack = a;
- this.maxchars = i;
- this.getName = b;
- this.getEntityId = h;
- this.geticon = e;
- this.getKeywords = k
-}
-
-TypeAheadControl.prototype.draw = function (b) {
- var a = this;
- this.dropDown = document.createElement("ul");
- this.dropDown.className = "IdPSelectDropDown";
- this.dropDown.style.visibility = "hidden";
- this.dropDown.style.width = this.textBox.offsetWidth;
- this.dropDown.current = -1;
- this.textBox.setAttribute("role", "listbox");
- document.body.appendChild(this.dropDown);
- this.textBox.setAttribute("role", "combobox");
- this.textBox.setAttribute("aria-controls", "IdPSelectDropDown");
- this.textBox.setAttribute("aria-owns", "IdPSelectDropDown");
- this.dropDown.onmouseover = function (c) {
- if (!c) {
- c = window.event
- }
- var d;
- if (c.target) {
- d = c.target
- }
- if (typeof d == "undefined") {
- d = c.srcElement
- }
- a.select(d)
- };
- this.dropDown.onmousedown = function (c) {
- if (-1 != a.dropDown.current) {
- a.textBox.value = a.results[a.dropDown.current][0]
- }
- };
- this.textBox.onkeyup = function (c) {
- if (!c) {
- c = window.event
- }
- a.handleKeyUp(c)
- };
- this.textBox.onkeydown = function (c) {
- if (!c) {
- c = window.event
- }
- a.handleKeyDown(c)
- };
- this.textBox.onblur = function () {
- a.hideDrop()
- };
- this.textBox.onfocus = function () {
- a.handleChange()
- };
- if (null == b || b) {
- this.textBox.focus()
- }
-};
-TypeAheadControl.prototype.getPossible = function (b) {
- var h = [];
- var j = 0;
- var f = 0;
- var e = 0;
- var g;
- var i;
- b = b.toLowerCase();
- while (f <= this.maxResults && j < this.elementList.length) {
- var a = false;
- var c = this.getName(this.elementList[j]);
- if (c.toLowerCase().indexOf(b) != -1) {
- a = true
- }
- if (!a && this.getEntityId(this.elementList[j]).toLowerCase().indexOf(b) != -1) {
- a = true
- }
- if (!a) {
- var d = this.getKeywords(this.elementList[j]);
- if (null != d && d.toLowerCase().indexOf(b) != -1) {
- a = true
- }
- }
- if (a) {
- h[f] = [c, this.getEntityId(this.elementList[j]), this.geticon(this.elementList[j])];
- f++
- }
- j++
- }
- this.dropDown.current = -1;
- return h
-};
-TypeAheadControl.prototype.handleKeyUp = function (b) {
- var a = b.keyCode;
- if (27 == a) {
- this.textBox.value = "";
- this.handleChange()
- } else {
- if (8 == a || 32 == a || (a >= 46 && a < 112) || a > 123) {
- this.handleChange()
- }
- }
-};
-TypeAheadControl.prototype.handleKeyDown = function (b) {
- var a = b.keyCode;
- if (38 == a) {
- this.upSelect()
- } else {
- if (40 == a) {
- this.downSelect()
- }
- }
-};
-TypeAheadControl.prototype.hideDrop = function () {
- var a = 0;
- if (null !== this.ie6hack) {
- while (a < this.ie6hack.length) {
- this.ie6hack[a].style.visibility = "visible";
- a++
- }
- }
- this.dropDown.style.visibility = "hidden";
- this.textBox.setAttribute("aria-expanded", "false");
- if (-1 == this.dropDown.current) {
- this.doUnselected()
- }
-};
-TypeAheadControl.prototype.showDrop = function () {
- var a = 0;
- if (null !== this.ie6hack) {
- while (a < this.ie6hack.length) {
- this.ie6hack[a].style.visibility = "hidden";
- a++
- }
- }
- this.dropDown.style.visibility = "visible";
- this.dropDown.style.width = this.textBox.offsetWidth + "px";
- this.textBox.setAttribute("aria-expanded", "true")
-};
-TypeAheadControl.prototype.doSelected = function () {
- this.submit.disabled = false
-};
-TypeAheadControl.prototype.doUnselected = function () {
- this.submit.disabled = true;
- this.textBox.setAttribute("aria-activedescendant", "")
-};
-TypeAheadControl.prototype.handleChange = function () {
- var b = this.textBox.value;
- var a = this.getPossible(b);
- if (0 === b.length || 0 === a.length || (!this.alwaysShow && this.maxResults < a.length)) {
- this.hideDrop();
- this.doUnselected();
- this.results = [];
- this.dropDown.current = -1
- } else {
- this.results = a;
- this.populateDropDown(a);
- if (1 == a.length) {
- this.select(this.dropDown.childNodes[0]);
- this.doSelected()
- } else {
- this.doUnselected()
- }
- }
-};
-TypeAheadControl.prototype.populateDropDown = function (d) {
- this.dropDown.innerHTML = "";
- var c = 0;
- var a;
- var b;
- var f;
- while (c < d.length) {
- a = document.createElement("li");
- a.id = "IdPSelectOption" + c;
- f = d[c][0];
- if (null !== d[c][2]) {
- b = document.createElement("img");
- b.src = d[c][2];
- b.width = 16;
- b.height = 16;
- b.alt = "";
- a.appendChild(b);
- if (f.length > this.maxchars - 2) {
- f = f.substring(0, this.maxchars - 2)
- }
- f = " " + f
- } else {
- if (f.length > this.maxchars) {
- f = f.substring(0, this.maxchars)
- }
- }
- a.appendChild(document.createTextNode(f));
- a.setAttribute("role", "option");
- this.dropDown.appendChild(a);
- c++
- }
- var e = this.getXY();
- this.dropDown.style.left = e[0] + "px";
- this.dropDown.style.top = e[1] + "px";
- this.showDrop()
-};
-TypeAheadControl.prototype.getXY = function () {
- var a = this.textBox;
- var c = 0;
- var b = a.offsetHeight;
- while (a.tagName != "BODY") {
- c += a.offsetLeft;
- b += a.offsetTop;
- a = a.offsetParent
- }
- c += a.offsetLeft;
- b += a.offsetTop;
- return [c, b]
-};
-TypeAheadControl.prototype.select = function (b) {
- var a = 0;
- var c;
- this.dropDown.current = -1;
- this.doUnselected();
- while (a < this.dropDown.childNodes.length) {
- c = this.dropDown.childNodes[a];
- if (c == b) {
- c.className = "IdPSelectCurrent";
- c.setAttribute("aria-selected", "true");
- this.textBox.setAttribute("aria-activedescendant", "IdPSelectOption" + a);
- this.doSelected();
- this.dropDown.current = a;
- this.origin.value = this.results[a][1];
- this.origin.textValue = this.results[a][0]
- } else {
- c.setAttribute("aria-selected", "false");
- c.className = ""
- }
- a++
- }
- this.textBox.focus()
-};
-TypeAheadControl.prototype.downSelect = function () {
- if (this.results.length > 0) {
- if (-1 == this.dropDown.current) {
- this.dropDown.current = 0;
- this.dropDown.childNodes[0].className = "IdPSelectCurrent";
- this.dropDown.childNodes[0].setAttribute("aria-selected", "true");
- this.textBox.setAttribute("aria-activedescendant", "IdPSelectOption" + 0);
- this.doSelected();
- this.origin.value = this.results[0][1];
- this.origin.textValue = this.results[0][0]
- } else {
- if (this.dropDown.current < (this.results.length - 1)) {
- this.dropDown.childNodes[this.dropDown.current].className = "";
- this.dropDown.current++;
- this.dropDown.childNodes[this.dropDown.current].className = "IdPSelectCurrent";
- this.dropDown.childNodes[this.dropDown.current].setAttribute("aria-selected", "true");
- this.textBox.setAttribute("aria-activedescendant", "IdPSelectOption" + this.dropDown.current);
- this.doSelected();
- this.origin.value = this.results[this.dropDown.current][1];
- this.origin.textValue = this.results[this.dropDown.current][0]
- }
- }
- }
-};
-TypeAheadControl.prototype.upSelect = function () {
- if ((this.results.length > 0) && (this.dropDown.current > 0)) {
- this.dropDown.childNodes[this.dropDown.current].className = "";
- this.dropDown.current--;
- this.dropDown.childNodes[this.dropDown.current].className = "IdPSelectCurrent";
- this.dropDown.childNodes[this.dropDown.current].setAttribute("aria-selected", "true");
- this.textBox.setAttribute("aria-activedescendant", "IdPSelectOption" + this.dropDown.current);
- this.doSelected();
- this.origin.value = this.results[this.dropDown.current][1];
- this.origin.textValue = this.results[this.dropDown.current][0]
- }
-};
-
-function IdPSelectUI() {
- var r;
- var W = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
- var aJ;
- var S;
- var aB;
- var an;
- var aa;
- var d;
- var F;
- var n;
- var y;
- var k;
- var aw;
- var g;
- var t;
- var ab;
- var ah;
- var D;
- var ag;
- var R;
- var h;
- var K;
- var au;
- var N;
- var T;
- var al;
- var ax;
- var aq;
- var c;
- var af;
- var G;
- var Q;
- var Z;
- var P;
- var U;
- var j;
- var az;
- var V;
- var aL = "idpSelect";
- var aj = "IdPSelect";
- var ar;
- var B = "";
- var Y = "";
- var aA = [];
- var aG = "entityID";
- this.draw = function (aP) {
- aJ = document.getElementById(aP.insertAtDiv);
- if (!m(aP)) {
- return
- }
- if (!aJ) {
- O(A("fatal.divMissing"));
- return
- }
- if ((null != Q) && (null != i(Q))) {
- var aM = b();
- if (aM.length != 0) {
- var aO = aG + "=" + encodeURIComponent(aM[0]);
- if (B.indexOf("?") == -1) {
- aO = "?" + aO
- } else {
- aO = "&" + aO
- }
- q(aJ, B + aO);
- return
- }
- }
- if (!f(aP.dataSource)) {
- return
- }
- aK();
- u(aP.hiddenIdPs);
- r.sort(function (aR, aQ) {
- return aE(aR).localeCompare(aE(aQ))
- });
- var aN = ac();
- aJ.appendChild(aN);
- ar.draw(aP.setFocusTextBox)
- };
- var m = function (aT) {
- var aN;
- D = aT.preferredIdP;
- ag = aT.maxPreferredIdPs;
- R = aT.helpURL;
- h = aT.ie6Hack;
- K = aT.samlIdPCookieTTL;
- al = aT.alwaysShow;
- ax = aT.maxResults;
- aq = aT.ignoreKeywords;
- if (aT.showListFirst) {
- c = aT.showListFirst
- } else {
- c = false
- }
- if (aT.noWriteCookie) {
- af = aT.noWriteCookie
- } else {
- af = false
- }
- if (aT.ignoreURLParams) {
- G = aT.ignoreURLParams
- } else {
- G = false
- }
- F = aT.defaultLogo;
- n = aT.defaultLogoWidth;
- y = aT.defaultLogoHeight;
- k = aT.minWidth;
- aw = aT.minHeight;
- g = aT.maxWidth;
- t = aT.maxHeight;
- ab = aT.bestRatio;
- if (null == aT.doNotCollapse) {
- ah = true
- } else {
- ah = aT.doNotCollapse
- }
- N = aT.maxIdPCharsButton;
- au = aT.maxIdPCharsDropDown;
- T = aT.maxIdPCharsAltTxt;
- Q = aT.autoFollowCookie;
- Z = aT.autoFollowCookieTTLs;
- var a3;
- if (typeof navigator == "undefined") {
- a3 = aT.defaultLanguage
- } else {
- a3 = navigator.language || navigator.userLanguage || aT.defaultLanguage
- }
- a3 = a3.toLowerCase();
- if (a3.indexOf("-") > 0) {
- aB = a3.substring(0, a3.indexOf("-"))
- }
- var aX = new IdPSelectLanguages();
- an = aT.defaultLanguage;
- if (typeof aT.langBundles != "undefined" && typeof aT.langBundles[a3] != "undefined") {
- aa = aT.langBundles[a3]
- } else {
- if (typeof aX.langBundles[a3] != "undefined") {
- aa = aX.langBundles[a3]
- } else {
- if (typeof aB != "undefined") {
- if (typeof aT.langBundles != "undefined" && typeof aT.langBundles[aB] != "undefined") {
- aa = aT.langBundles[aB]
- } else {
- if (typeof aX.langBundles[aB] != "undefined") {
- aa = aX.langBundles[aB]
- }
- }
- }
- }
- }
- if (typeof aT.langBundles != "undefined" && typeof aT.langBundles[aT.defaultLanguage] != "undefined") {
- d = aT.langBundles[aT.defaultLanguage]
- } else {
- d = aX.langBundles[aT.defaultLanguage]
- }
- if (!d) {
- O("No languages work");
- return false
- }
- if (!aa) {
- s("No language support for " + a3);
- aa = d
- }
- if (aT.testGUI) {
- return true
- }
- var aY = "urn:oasis:names:tc:SAML:profiles:SSO:idpdiscovery-protocol:single";
- var a1;
- var a2 = false;
- var aR;
- var aU;
- var aQ = window;
- while (null !== aQ.parent && aQ !== aQ.parent) {
- aQ = aQ.parent
- }
- var aW = aQ.location;
- var aS = aW.search;
- if (G || null == aS || 0 == aS.length || aS.charAt(0) != "?") {
- if ((null == aT.defaultReturn) && !G) {
- O(A("fatal.noparms"));
- return false
- }
- aN = aT.myEntityID;
- B = aT.defaultReturn;
- if (null != aT.defaultReturnIDParam) {
- aG = aT.defaultReturnIDParam
- }
- } else {
- aS = aS.substring(1);
- aR = aS.split("&");
- if (aR.length === 0) {
- O(A("fatal.noparms"));
- return false
- }
- for (a1 = 0; a1 < aR.length; a1++) {
- aU = aR[a1].split("=");
- if (aU.length != 2) {
- continue
- }
- if (aU[0] == "entityID") {
- aN = decodeURIComponent(aU[1])
- } else {
- if (aU[0] == "return") {
- B = decodeURIComponent(aU[1])
- } else {
- if (aU[0] == "returnIDParam") {
- aG = decodeURIComponent(aU[1])
- } else {
- if (aU[0] == "policy") {
- aY = decodeURIComponent(aU[1])
- } else {
- if (aU[0] == "isPassive") {
- a2 = (aU[1].toUpperCase() == "TRUE")
- }
- }
- }
- }
- }
- }
- }
- var aM;
- if (null == aT.allowableProtocols) {
- aM = ["urn:oasis:names:tc:SAML:profiles:SSO:idpdiscovery-protocol:single"]
- } else {
- aM = aT.allowableProtocols
- }
- var a0 = false;
- for (var a1 = 0; a1 < aM.length; a1++) {
- var aZ = aM[a1];
- if (aY == aZ) {
- a0 = true;
- break
- }
- }
- if (!a0) {
- O(A("fatal.wrongProtocol"));
- return false
- }
-
- /**
- * Support a collection of entity ids for service providers.
- * This section is customized and specific to Apereo CAS.
- */
- if (aN != null && aT.myEntityID !== null) {
- aN.forEach(function(el) {
- if (!aT.myEntityID.includes(el)) {
- O(A("fatal.wrongEntityId") + '"' + aN + '" != "' + aT.myEntityID + '"');
- return false
- }
- });
- }
-
- if (null === B || B.length === 0) {
- O(A("fatal.noReturnURL"));
- return false
- }
- if (!ao(B)) {
- O(A("fatal.badProtocol"));
- return false
- }
- if (!e(aT.returnWhiteList, B)) {
- ae(A("fatal.badReturnString"));
- return false
- }
- if (a2) {
- var aP = b();
- var aV = document.getElementById(parmsSupplied.insertAtDiv);
- if (aP.length == 0) {
- q(aV, B);
- return false
- } else {
- var aO = aG + "=" + encodeURIComponent(aP[0]);
- if (B.indexOf("?") == -1) {
- aO = "?" + aO
- } else {
- aO = "&" + aO
- }
- q(aV, B + aO);
- return false
- }
- }
- a1 = B.indexOf("?");
- if (a1 < 0) {
- Y = B;
- return true
- }
- Y = B.substring(0, a1);
- aS = B.substring(a1 + 1);
- aR = aS.split("&");
- for (a1 = 0; a1 < aR.length; a1++) {
- aU = aR[a1].split("=");
- if (aU.length != 2) {
- continue
- }
- aU[1] = decodeURIComponent(aU[1]);
- aA.push(aU)
- }
- return true
- };
- var aK = function () {
- var aO = [];
- var aN;
- for (aN = 0; aN < r.length;) {
- var aM = z(r[aN]);
- if (null == aO[aM]) {
- aO[aM] = aM;
- aN = aN + 1
- } else {
- r.splice(aN, 1)
- }
- }
- };
- var u = function (aO) {
- if (null == aO || 0 == aO.length) {
- return
- }
- var aN;
- var aM;
- for (aN = 0; aN < aO.length; aN++) {
- for (aM = 0; aM < r.length; aM++) {
- if (z(r[aM]) == aO[aN]) {
- r.splice(aM, 1);
- break
- }
- }
- }
- };
- var ao = function (aN) {
- if (null === aN) {
- return false
- }
- var aM = "://";
- var aO = aN.indexOf(aM);
- if (aO < 0) {
- return false
- }
- aN = aN.substring(0, aO);
- if (aN == "http" || aN == "https") {
- return true
- }
- return false
- };
- var e = function (aM, aN) {
- if (null == aM) {
- return true
- }
- for (var aO = 0; aO < aM.length; aO++) {
- var aP = new RegExp(aM[aO]);
- if (aP.test(aN)) {
- return true
- }
- }
- return false
- };
- var aI = function () {
- if (null == navigator) {
- return false
- }
- var aM = navigator.appName;
- if (null == aM) {
- return false
- }
- return (aM == "Microsoft Internet Explorer")
- };
- var q = function (aN, aO) {
- var aM = document.createElement("a");
- aM.href = aO;
- aN.appendChild(aM);
- aM.click()
- };
- var f = function (aP) {
- var aO = null;
- try {
- aO = new XMLHttpRequest()
- } catch (aN) {
- }
- if (null == aO) {
- try {
- aO = new ActiveXObject("Microsoft.XMLHTTP")
- } catch (aN) {
- }
- }
- if (null == aO) {
- try {
- aO = new ActiveXObject("MSXML2.XMLHTTP.3.0")
- } catch (aN) {
- }
- }
- if (null == aO) {
- O(A("fatal.noXMLHttpRequest"));
- return false
- }
- if (aI()) {
- aP += "?random=" + (Math.random() * 1000000)
- }
- aO.open("GET", aP, false);
- if (typeof aO.overrideMimeType == "function") {
- aO.overrideMimeType("application/json")
- }
- aO.send(null);
- if (aO.status == 200) {
- var aM = aO.responseText;
- if (aM === null) {
- O(A("fatal.noData"));
- return false
- }
- r = JSON.parse(aM)
- } else {
- O(A("fatal.loadFailed") + aP);
- return false
- }
- return true
- };
- var ad = function (aM) {
- for (var aN = 0; aN < r.length; aN++) {
- if (z(r[aN]) == aM) {
- return r[aN]
- }
- }
- return null
- };
- var H = function (aT, aN) {
- var aS = function (aW) {
- var aU = null;
- var aV;
- if (null == aT.Logos) {
- return null
- }
- for (aV in aT.Logos) {
- if (aT.Logos[aV].lang == aW && aT.Logos[aV].width != null && aT.Logos[aV].width >= k && aT.Logos[aV].height != null && aT.Logos[aV].height >= aw) {
- if (aU === null) {
- aU = aT.Logos[aV]
- } else {
- me = Math.abs(ab - Math.log(aT.Logos[aV].width / aT.Logos[aV].height));
- him = Math.abs(ab - Math.log(aU.width / aU.height));
- if (him > me) {
- aU = aT.Logos[aV]
- }
- }
- }
- }
- return aU
- };
- var aP = null;
- var aO = document.createElement("img");
- am(aO, "IdPImg");
- aP = aS(S);
- if (null === aP && typeof aB != "undefined") {
- aP = aS(aB)
- }
- if (null === aP) {
- aP = aS(null)
- }
- if (null === aP) {
- aP = aS(an)
- }
- if (null === aP) {
- if (!aN) {
- return null
- }
- aO.src = F;
- aO.width = n;
- aO.height = y;
- aO.alt = A("defaultLogoAlt");
- return aO
- }
- aO.src = aP.value;
- var aQ = aE(aT);
- if (aQ.length > T) {
- aQ = aQ.substring(0, T) + "..."
- }
- aO.alt = aQ;
- var aM = aP.width;
- var aR = aP.height;
- if (aM > g) {
- aR = (g / aM) * aR;
- aM = g
- }
- if (aR > t) {
- aM = (t / aR) * aM;
- aR = t
- }
- aO.setAttribute("width", aM);
- aO.setAttribute("height", aR);
- return aO
- };
- var ac = function () {
- var aN = ap("IdPSelector");
- var aM;
- aM = aC(aN);
- o(aN, aM);
- X(aN, aM);
- if (null != Q) {
- C(aN)
- }
- return aN
- };
- var M = function (aO, aV, aN) {
- var aM = ap(undefined, "PreferredIdPButton");
- var aU = document.createElement("a");
- var aT = aG + "=" + encodeURIComponent(z(aO));
- var aP = B;
- var aR = H(aO, aN);
- if (aP.indexOf("?") == -1) {
- aT = "?" + aT
- } else {
- aT = "&" + aT
- }
- aU.href = aP + aT;
- aU.onclick = function () {
- aH(z(aO))
- };
- if (null != aR) {
- var aW = ap(undefined, "PreferredIdPImg");
- aW.appendChild(aR);
- aU.appendChild(aW)
- }
- var aS = ap(undefined, "TextDiv");
- var aQ = aE(aO);
- if (aQ.length > N) {
- aQ = aQ.substring(0, N) + "..."
- }
- aM.title = aQ;
- aS.appendChild(document.createTextNode(aQ));
- aU.appendChild(aS);
- aM.appendChild(aU);
- return aM
- };
- var aF = function (aM, aP) {
- var aO = ap(undefined, "TextDiv");
- var aN = document.createTextNode(A(aP));
- aO.appendChild(aN);
- aM.appendChild(aO)
- };
- var a = function (aM, aO) {
- if (null === aO || 0 === aO.length || "-" == aO.value) {
- return
- }
- var aN = 0;
- while (aN < aM.options.length) {
- if (aM.options[aN].value == aO) {
- aM.options[aN].selected = true;
- break
- }
- aN++
- }
- };
- var aC = function (aR) {
- var aQ = L();
- if (0 === aQ.length) {
- return false
- }
- var aM = ah;
- for (var aO = 0; aO < ag && aO < aQ.length; aO++) {
- if (aQ[aO] && H(aQ[aO], false)) {
- aM = true
- }
- }
- var aP;
- if (aM) {
- aP = ap("PreferredIdPTile")
- } else {
- aP = ap("PreferredIdPTileNoImg")
- }
- aF(aP, "idpPreferred.label");
- for (var aO = 0; aO < ag && aO < aQ.length; aO++) {
- if (aQ[aO]) {
- var aN = M(aQ[aO], aO, aM);
- aP.appendChild(aN)
- }
- }
- aR.appendChild(aP);
- return true
- };
- var ai = function () {
- var aN = document.createElement("form");
- U.appendChild(aN);
- aN.action = Y;
- aN.method = "GET";
- aN.setAttribute("autocomplete", "OFF");
- var aM = 0;
- for (aM = 0; aM < aA.length; aM++) {
- var aO = document.createElement("input");
- aO.setAttribute("type", "hidden");
- aO.name = aA[aM][0];
- aO.value = aA[aM][1];
- aN.appendChild(aO)
- }
- return aN
- };
- var o = function (aT, aN) {
- U = ap("IdPEntryTile");
- if (c) {
- U.style.display = "none"
- }
- var aO = document.createElement("label");
- aO.setAttribute("for", aL + "Input");
- if (aN) {
- aF(aO, "idpEntry.label")
- } else {
- aF(aO, "idpEntry.NoPreferred.label")
- }
- var aR = ai();
- aR.appendChild(aO);
- var aQ = document.createElement("input");
- aR.appendChild(aQ);
- aQ.type = "text";
- l(aQ, "Input");
- var aS = document.createElement("input");
- aS.setAttribute("type", "hidden");
- aR.appendChild(aS);
- aS.name = aG;
- aS.value = "-";
- var aP = v("Select");
- aP.disabled = true;
- aR.appendChild(aP);
- aR.onsubmit = function () {
- if (null === aS.value || 0 === aS.value.length || "-" == aS.value) {
- return false
- }
- aQ.value = aS.textValue;
- aH(aS.value);
- return true
- };
- ar = new TypeAheadControl(r, aQ, aS, aP, au, aE, z, ak, h, al, ax, I);
- var aM = document.createElement("a");
- aM.appendChild(document.createTextNode(A("idpList.showList")));
- aM.href = "#";
- am(aM, "DropDownToggle");
- aM.onclick = function () {
- U.style.display = "none";
- a(az, aS.value);
- j.style.display = "";
- V.focus();
- return false
- };
- U.appendChild(aM);
- x(U);
- aT.appendChild(U)
- };
- var X = function (aM, aP) {
- j = ap("IdPListTile");
- if (!c) {
- j.style.display = "none"
- }
- var aT = document.createElement("label");
- aT.setAttribute("for", aL + "Selector");
- if (aP) {
- aF(aT, "idpList.label")
- } else {
- aF(aT, "idpList.NoPreferred.label")
- }
- az = document.createElement("select");
- l(az, "Selector");
- az.name = aG;
- j.appendChild(az);
- var aU = p("-", A("idpList.defaultOptionLabel"));
- aU.selected = true;
- az.appendChild(aU);
- var aO;
- for (var aQ = 0; aQ < r.length; aQ++) {
- aO = r[aQ];
- aU = p(z(aO), aE(aO));
- az.appendChild(aU)
- }
- var aN = ai();
- aN.appendChild(aT);
- aN.appendChild(az);
- aN.onsubmit = function () {
- if (az.selectedIndex < 1) {
- return false
- }
- aH(az.options[az.selectedIndex].value);
- return true
- };
- var aR = v("List");
- V = aR;
- aN.appendChild(aR);
- j.appendChild(aN);
- var aS = document.createElement("a");
- aS.appendChild(document.createTextNode(A("idpList.showSearch")));
- aS.href = "#";
- am(aS, "DropDownToggle");
- aS.onclick = function () {
- U.style.display = "";
- j.style.display = "none";
- return false
- };
- j.appendChild(aS);
- x(j);
- aM.appendChild(j)
- };
- var C = function (aP) {
- var aN = "IdPSelectAutoDisp";
- autoDispatchTile = ap(undefined, "autoDispatchArea");
- autoDispatchTile.appendChild(document.createTextNode(A("autoFollow.message")));
- var aM = document.createElement("input");
- aM.setAttribute("type", "radio");
- aM.setAttribute("checked", "checked");
- aM.setAttribute("name", aN);
- aM.onclick = function () {
- E(0)
- };
- div = ap(undefined, "autoDispatchTile");
- div.appendChild(aM);
- div.appendChild(document.createTextNode(A("autoFollow.never")));
- autoDispatchTile.appendChild(div);
- var aO;
- for (aO = 0; aO < Z.length; aO++) {
- aM = document.createElement("input");
- aM.setAttribute("type", "radio");
- aM.setAttribute("name", aN);
- aM.life = Z[aO];
- aM.onclick = function () {
- var aQ = this.life;
- E(aQ)
- };
- div = ap(undefined, "autoDispatchTile");
- div.appendChild(aM);
- div.appendChild(document.createTextNode(A("autoFollow.time" + aO)));
- autoDispatchTile.appendChild(div)
- }
- aP.appendChild(autoDispatchTile)
- };
- var v = function (aN) {
- var aM = document.createElement("input");
- aM.setAttribute("type", "submit");
- aM.value = A("submitButton.label");
- l(aM, aN + "Button");
- return aM
- };
- var x = function (aN) {
- var aM = document.createElement("a");
- aM.href = R;
- aM.appendChild(document.createTextNode(A("helpText")));
- am(aM, "HelpButton");
- aN.appendChild(aM)
- };
- var ap = function (aO, aM) {
- var aN = document.createElement("div");
- if (undefined !== aO) {
- l(aN, aO)
- }
- if (undefined !== aM) {
- am(aN, aM)
- }
- return aN
- };
- var p = function (aN, aO) {
- var aM = document.createElement("option");
- aM.value = aN;
- if (aO.length > au) {
- aO = aO.substring(0, au)
- }
- aM.appendChild(document.createTextNode(aO));
- return aM
- };
- var l = function (aN, aM) {
- aN.id = aL + aM
- };
- var am = function (aN, aM) {
- aN.setAttribute("class", aj + aM)
- };
- var aD = function (aM) {
- return document.getElementById(aL + aM)
- };
- var aH = function (aM) {
- J(aM);
- at(P)
- };
- var A = function (aM) {
- var aN = aa[aM];
- if (!aN) {
- aN = d[aM]
- }
- if (!aN) {
- aN = "Missing message for " + aM
- }
- return aN
- };
- var z = function (aM) {
- return aM.entityID
- };
- var ak = function (aO) {
- var aM;
- if (null == aO.Logos) {
- return null
- }
- for (aM = 0; aM < aO.Logos.length; aM++) {
- var aN = aO.Logos[aM];
- if (aN.height == "16" && aN.width == "16") {
- if (null == aN.lang || S == aN.lang || (typeof aB != "undefined" && aB == aN.lang) || an == aN.lang) {
- return aN.value
- }
- }
- }
- return null
- };
- var aE = function (aN) {
- var aM = ay(aN.DisplayNames);
- if (null !== aM) {
- return aM
- }
- s("No Name entry in any language for " + z(aN));
- return z(aN)
- };
- var I = function (aN) {
- if (aq || null == aN.Keywords) {
- return null
- }
- var aM = ay(aN.Keywords);
- return aM
- };
- var ay = function (aM) {
- var aN;
- for (aN in aM) {
- if (aM[aN].lang == S) {
- return aM[aN].value
- }
- }
- if (typeof aB != "undefined") {
- for (aN in aM) {
- if (aM[aN].lang == aB) {
- return aM[aN].value
- }
- }
- }
- for (aN in aM) {
- if (aM[aN].lang == null) {
- return aM[aN].value
- }
- }
- for (aN in aM) {
- if (aM[aN].lang == an) {
- return aM[aN].value
- }
- }
- return null
- };
- var L = function () {
- var aQ = [];
- var aP = 0;
- var aO;
- var aN;
- if (null != D) {
- for (aO = 0; aO < D.length && aO < ag; aO++) {
- aQ[aO] = ad(D[aO]);
- aP++
- }
- }
- P = b();
- for (aO = aP, aN = 0; aN < P.length && aO < ag; aN++) {
- var aM = ad(P[aN]);
- if (typeof aQ.indexOf === "undefined") {
- aQ.push(aM);
- aO++
- } else {
- if (aQ.indexOf(aM) === -1) {
- aQ.push(aM);
- aO++
- }
- }
- }
- return aQ
- };
- var J = function (aM) {
- var aN = [];
- while (0 !== P.length) {
- var aO = P.pop();
- if (aO != aM) {
- aN.unshift(aO)
- }
- }
- aN.unshift(aM);
- P = aN;
- return
- };
- var E = function (aO) {
- var aM;
- if (aO > 0) {
- var aN = new Date();
- cookieTTL = aO * 24 * 60 * 60 * 1000;
- aM = new Date(aN.getTime() + cookieTTL)
- } else {
- aM = new Date(0)
- }
- document.cookie = Q + "=1;path=/;expires=" + aM.toUTCString()
- };
- var i = function (aO) {
- var aQ, aN;
- var aR;
- aR = document.cookie.split(";");
- for (aQ = 0; aQ < aR.length; aQ++) {
- var aP = aR[aQ];
- var aM = aP.indexOf("=");
- var aS = aP.substring(0, aM);
- if (aO == (aS.replace(/^\s+|\s+$/g, ""))) {
- return aP.substring(aM + 1)
- }
- }
- return null
- };
- var b = function () {
- var aM = [];
- var aN;
- var aO = i("_saml_idp");
- if (aO != null) {
- aO = aO.replace(/^\s+|\s+$/g, "");
- aO = aO.replace("+", "%20");
- aO = aO.split("%20");
- for (aN = aO.length; aN > 0; aN--) {
- if (0 === aO[aN - 1].length) {
- continue
- }
- var aP = av(decodeURIComponent(aO[aN - 1]));
- if (aP.length > 0) {
- aM.push(aP)
- }
- }
- }
- return aM
- };
- var at = function (aR) {
- var aO = [];
- var aQ = aR.length;
- if (af) {
- return
- }
- if (aQ > 5) {
- aQ = 5
- }
- for (var aP = aQ; aP > 0; aP--) {
- if (aR[aP - 1].length > 0) {
- aO.push(encodeURIComponent(w(aR[aP - 1])))
- }
- }
- var aM = null;
- if (K) {
- var aN = new Date();
- cookieTTL = K * 24 * 60 * 60 * 1000;
- aM = new Date(aN.getTime() + cookieTTL)
- }
- document.cookie = "_saml_idp=" + aO.join("%20") + "; path = /" + ((aM === null) ? "" : "; expires=" + aM.toUTCString())
- };
- var w = function (aV) {
- var aM = "", aQ, aO, aN, aU, aT, aS, aR;
- for (var aP = 0; aP < aV.length;) {
- aQ = aV.charCodeAt(aP++);
- aO = aV.charCodeAt(aP++);
- aN = aV.charCodeAt(aP++);
- aU = aQ >> 2;
- aT = ((aQ & 3) << 4) + (aO >> 4);
- aS = ((aO & 15) << 2) + (aN >> 6);
- aR = aN & 63;
- if (isNaN(aO)) {
- aS = aR = 64
- } else {
- if (isNaN(aN)) {
- aR = 64
- }
- }
- aM += W.charAt(aU) + W.charAt(aT) + W.charAt(aS) + W.charAt(aR)
- }
- return aM
- };
- var av = function (aP) {
- var aN = "", aW, aU, aS, aV, aT, aR, aQ;
- var aO = 0;
- var aM = /[^A-Za-z0-9\+\/\=]/g;
- aP = aP.replace(/[^A-Za-z0-9\+\/\=]/g, "");
- do {
- aV = W.indexOf(aP.charAt(aO++));
- aT = W.indexOf(aP.charAt(aO++));
- aR = W.indexOf(aP.charAt(aO++));
- aQ = W.indexOf(aP.charAt(aO++));
- aW = (aV << 2) | (aT >> 4);
- aU = ((aT & 15) << 4) | (aR >> 2);
- aS = ((aR & 3) << 6) | aQ;
- aN = aN + String.fromCharCode(aW);
- if (aR != 64) {
- aN = aN + String.fromCharCode(aU)
- }
- if (aQ != 64) {
- aN = aN + String.fromCharCode(aS)
- }
- aW = aU = aS = "";
- aV = aT = aR = aQ = ""
- } while (aO < aP.length);
- return aN
- };
- var ae = function (aN) {
- if (aJ) {
- var aM = document.createTextNode(aN);
- aJ.appendChild(aM)
- } else {
- $('#errorDiv').show('true');
- $('#errorDiv').empty();
- $('#errorDiv').append(aN);
- }
- };
- var O = function (aM) {
- $('#errorDiv').show('true');
- $('#errorDiv').empty();
- $('#errorDiv').append(aM);
- if (aJ) {
- ae(aM)
- }
- };
- var s = function () {
- }
-}
-
-(new IdPSelectUI()).draw(new IdPSelectUIParms());
diff --git a/cas/src/main/resources/static/assets/js/samlidp/idpselect_config.js b/cas/src/main/resources/static/assets/js/samlidp/idpselect_config.js
deleted file mode 100644
index 79e98fc7..00000000
--- a/cas/src/main/resources/static/assets/js/samlidp/idpselect_config.js
+++ /dev/null
@@ -1,78 +0,0 @@
-function IdPSelectUIParms(){
- this.alwaysShow = true; // If true, this will show results as soon as you start typing
- this.defaultLanguage = 'en'; // Language to use if the browser local doesnt have a bundle
-
- this.defaultLogoWidth = 64;
- this.defaultLogoHeight = 64 ;
- //this.defaultReturn = null; // If non null, then the default place to send users who are not
- // Approaching via the Discovery Protocol for example
- //this.defaultReturn = "https://example.org/Shibboleth.sso/DS?SAMLDS=1&target=https://example.org/secure";
- //this.defaultReturnIDParam = "";
- this.returnWhiteList = [];
- //this.helpURL = 'https://wiki.shibboleth.net/confluence/display/SHIB2/DSRoadmap';
- this.ie6Hack = null; // An array of structures to disable when drawing the pull down (needed to
- // handle the ie6 z axis problem
- this.insertAtDiv = 'idpSelect'; // The div where we will insert the data
- this.maxResults = 10; // How many results to show at once or the number at which to
- // start showing if alwaysShow is false
- this.preferredIdP = null; // Array of entityIds to always show
- this.hiddenIdPs = null; // Array of entityIds to delete
- this.ignoreKeywords = false; // Do we ignore the
when looking for candidates
- this.showListFirst = false; // Do we start with a list of IdPs or just the dropdown
- this.samlIdPCookieTTL = 730; // in days
- this.setFocusTextBox = true; // Set to false to suppress focus
- this.testGUI = false;
-
- this.autoFollowCookie = '_shibboleth_eds'; // If you want auto-dispatch, set this to the cookie name to use
- this.autoFollowCookieTTLs = [ 1, 60, 270 ]; // Cookie life (in days). Changing this requires changes to idp_select_languages
-
- //
- // Language support.
- //
- // The minified source provides "en", "de", "pt-br" and "jp".
- //
- // Override any of these below, or provide your own language
- //
- //this.langBundles = {
- //'en': {
- // 'fatal.divMissing': '
specified as "insertAtDiv" could not be located in the HTML',
- // 'fatal.noXMLHttpRequest': 'Browser does not support XMLHttpRequest, unable to load IdP selection data',
- // 'fatal.wrongProtocol' : 'Policy supplied to DS was not "urn:oasis:names:tc:SAML:profiles:SSO:idpdiscovery-protocol:single"',
- // 'fatal.wrongEntityId' : 'entityId supplied by SP did not match configuration',
- // 'fatal.noData' : 'Metadata download returned no data',
- // 'fatal.loadFailed': 'Failed to download metadata from ',
- // 'fatal.noparms' : 'No parameters to discovery session and no defaultReturn parameter configured',
- // 'fatal.noReturnURL' : "No URL return parameter provided",
- // 'fatal.badProtocol' : "Return request must start with https:// or http://",
- // 'idpPreferred.label': 'Use a suggested selection:',
- // 'idpEntry.label': 'Or enter your organization\'s name',
- // 'idpEntry.NoPreferred.label': 'Enter your organization\'s name',
- // 'idpList.label': 'Or select your organization from the list below',
- // 'idpList.NoPreferred.label': 'Select your organization from the list below',
- // 'idpList.defaultOptionLabel': 'Please select your organization...',
- // 'idpList.showList' : 'Allow me to pick from a list',
- // 'idpList.showSearch' : 'Allow me to specify the site',
- // 'submitButton.label': 'Continue',
- // 'helpText': 'Help',
- // 'defaultLogoAlt' : 'DefaultLogo'
- //}
- //};
-
- //
- // The following should not be changed without changes to the css. Consider them as mandatory defaults
- //
- this.maxPreferredIdPs = 5;
- this.maxIdPCharsButton = 33;
- this.maxIdPCharsDropDown = 58;
- this.maxIdPCharsAltTxt = 60;
-
- this.minWidth = 30;
- this.minHeight = 20;
- this.maxWidth = 115;
- this.maxHeight = 69;
- this.bestRatio = Math.log(80 / 60);
-
- IdPSelectUIParametersForCAS(this);
-}
-
-
diff --git a/cas/src/main/resources/static/assets/js/u2f/u2f-api.js b/cas/src/main/resources/static/assets/js/u2f/u2f-api.js
deleted file mode 100644
index 4fda24ba..00000000
--- a/cas/src/main/resources/static/assets/js/u2f/u2f-api.js
+++ /dev/null
@@ -1,748 +0,0 @@
-//Copyright 2014-2015 Google Inc. All rights reserved.
-
-//Use of this source code is governed by a BSD-style
-//license that can be found in the LICENSE file or at
-//https://developers.google.com/open-source/licenses/bsd
-
-/**
- * @fileoverview The U2F api.
- */
-'use strict';
-
-
-/**
- * Namespace for the U2F api.
- * @type {Object}
- */
-var u2f = u2f || {};
-
-/**
- * FIDO U2F Javascript API Version
- * @number
- */
-var js_api_version;
-
-/**
- * The U2F extension id
- * @const {string}
- */
-// The Chrome packaged app extension ID.
-// Uncomment this if you want to deploy a server instance that uses
-// the package Chrome app and does not require installing the U2F Chrome extension.
-u2f.EXTENSION_ID = 'kmendfapggjehodndflmmgagdbamhnfd';
-// The U2F Chrome extension ID.
-// Uncomment this if you want to deploy a server instance that uses
-// the U2F Chrome extension to authenticate.
-// u2f.EXTENSION_ID = 'pfboblefjcgdjicmnffhdgionmgcdmne';
-
-
-/**
- * Message types for messsages to/from the extension
- * @const
- * @enum {string}
- */
-u2f.MessageTypes = {
- 'U2F_REGISTER_REQUEST': 'u2f_register_request',
- 'U2F_REGISTER_RESPONSE': 'u2f_register_response',
- 'U2F_SIGN_REQUEST': 'u2f_sign_request',
- 'U2F_SIGN_RESPONSE': 'u2f_sign_response',
- 'U2F_GET_API_VERSION_REQUEST': 'u2f_get_api_version_request',
- 'U2F_GET_API_VERSION_RESPONSE': 'u2f_get_api_version_response'
-};
-
-
-/**
- * Response status codes
- * @const
- * @enum {number}
- */
-u2f.ErrorCodes = {
- 'OK': 0,
- 'OTHER_ERROR': 1,
- 'BAD_REQUEST': 2,
- 'CONFIGURATION_UNSUPPORTED': 3,
- 'DEVICE_INELIGIBLE': 4,
- 'TIMEOUT': 5
-};
-
-
-/**
- * A message for registration requests
- * @typedef {{
- * type: u2f.MessageTypes,
- * appId: ?string,
- * timeoutSeconds: ?number,
- * requestId: ?number
- * }}
- */
-u2f.U2fRequest;
-
-
-/**
- * A message for registration responses
- * @typedef {{
- * type: u2f.MessageTypes,
- * responseData: (u2f.Error | u2f.RegisterResponse | u2f.SignResponse),
- * requestId: ?number
- * }}
- */
-u2f.U2fResponse;
-
-
-/**
- * An error object for responses
- * @typedef {{
- * errorCode: u2f.ErrorCodes,
- * errorMessage: ?string
- * }}
- */
-u2f.Error;
-
-/**
- * Data object for a single sign request.
- * @typedef {enum {BLUETOOTH_RADIO, BLUETOOTH_LOW_ENERGY, USB, NFC}}
- */
-u2f.Transport;
-
-
-/**
- * Data object for a single sign request.
- * @typedef {Array
}
- */
-u2f.Transports;
-
-/**
- * Data object for a single sign request.
- * @typedef {{
- * version: string,
- * challenge: string,
- * keyHandle: string,
- * appId: string
- * }}
- */
-u2f.SignRequest;
-
-
-/**
- * Data object for a sign response.
- * @typedef {{
- * keyHandle: string,
- * signatureData: string,
- * clientData: string
- * }}
- */
-u2f.SignResponse;
-
-
-/**
- * Data object for a registration request.
- * @typedef {{
- * version: string,
- * challenge: string
- * }}
- */
-u2f.RegisterRequest;
-
-
-/**
- * Data object for a registration response.
- * @typedef {{
- * version: string,
- * keyHandle: string,
- * transports: Transports,
- * appId: string
- * }}
- */
-u2f.RegisterResponse;
-
-
-/**
- * Data object for a registered key.
- * @typedef {{
- * version: string,
- * keyHandle: string,
- * transports: ?Transports,
- * appId: ?string
- * }}
- */
-u2f.RegisteredKey;
-
-
-/**
- * Data object for a get API register response.
- * @typedef {{
- * js_api_version: number
- * }}
- */
-u2f.GetJsApiVersionResponse;
-
-
-//Low level MessagePort API support
-
-/**
- * Sets up a MessagePort to the U2F extension using the
- * available mechanisms.
- * @param {function((MessagePort|u2f.WrappedChromeRuntimePort_))} callback
- */
-u2f.getMessagePort = function(callback) {
- if (typeof chrome != 'undefined' && chrome.runtime) {
- // The actual message here does not matter, but we need to get a reply
- // for the callback to run. Thus, send an empty signature request
- // in order to get a failure response.
- var msg = {
- type: u2f.MessageTypes.U2F_SIGN_REQUEST,
- signRequests: []
- };
- chrome.runtime.sendMessage(u2f.EXTENSION_ID, msg, function() {
- if (!chrome.runtime.lastError) {
- // We are on a allowed origin and can talk directly
- // with the extension.
- u2f.getChromeRuntimePort_(callback);
- } else {
- // chrome.runtime was available, but we couldn't message
- // the extension directly, use iframe
- u2f.getIframePort_(callback);
- }
- });
- } else if (u2f.isAndroidChrome_()) {
- u2f.getAuthenticatorPort_(callback);
- } else if (u2f.isIosChrome_()) {
- u2f.getIosPort_(callback);
- } else {
- // chrome.runtime was not available at all, which is normal
- // when this origin doesn't have access to any extensions.
- u2f.getIframePort_(callback);
- }
-};
-
-/**
- * Detect chrome running on android based on the browser's useragent.
- * @private
- */
-u2f.isAndroidChrome_ = function() {
- var userAgent = navigator.userAgent;
- return userAgent.indexOf('Chrome') != -1 &&
- userAgent.indexOf('Android') != -1;
-};
-
-/**
- * Detect chrome running on iOS based on the browser's platform.
- * @private
- */
-u2f.isIosChrome_ = function() {
- return ["iPhone", "iPad", "iPod"].indexOf(navigator.platform) > -1;
-};
-
-/**
- * Connects directly to the extension via chrome.runtime.connect.
- * @param {function(u2f.WrappedChromeRuntimePort_)} callback
- * @private
- */
-u2f.getChromeRuntimePort_ = function(callback) {
- var port = chrome.runtime.connect(u2f.EXTENSION_ID,
- {'includeTlsChannelId': true});
- setTimeout(function() {
- callback(new u2f.WrappedChromeRuntimePort_(port));
- }, 0);
-};
-
-/**
- * Return a 'port' abstraction to the Authenticator app.
- * @param {function(u2f.WrappedAuthenticatorPort_)} callback
- * @private
- */
-u2f.getAuthenticatorPort_ = function(callback) {
- setTimeout(function() {
- callback(new u2f.WrappedAuthenticatorPort_());
- }, 0);
-};
-
-/**
- * Return a 'port' abstraction to the iOS client app.
- * @param {function(u2f.WrappedIosPort_)} callback
- * @private
- */
-u2f.getIosPort_ = function(callback) {
- setTimeout(function() {
- callback(new u2f.WrappedIosPort_());
- }, 0);
-};
-
-/**
- * A wrapper for chrome.runtime.Port that is compatible with MessagePort.
- * @param {Port} port
- * @constructor
- * @private
- */
-u2f.WrappedChromeRuntimePort_ = function(port) {
- this.port_ = port;
-};
-
-/**
- * Format and return a sign request compliant with the JS API version supported by the extension.
- * @param {Array} signRequests
- * @param {number} timeoutSeconds
- * @param {number} reqId
- * @return {Object}
- */
-u2f.formatSignRequest_ =
- function(appId, challenge, registeredKeys, timeoutSeconds, reqId) {
- if (js_api_version === undefined || js_api_version < 1.1) {
- // Adapt request to the 1.0 JS API
- var signRequests = [];
- for (var i = 0; i < registeredKeys.length; i++) {
- signRequests[i] = {
- version: registeredKeys[i].version,
- challenge: challenge,
- keyHandle: registeredKeys[i].keyHandle,
- appId: appId
- };
- }
- return {
- type: u2f.MessageTypes.U2F_SIGN_REQUEST,
- signRequests: signRequests,
- timeoutSeconds: timeoutSeconds,
- requestId: reqId
- };
- }
- // JS 1.1 API
- return {
- type: u2f.MessageTypes.U2F_SIGN_REQUEST,
- appId: appId,
- challenge: challenge,
- registeredKeys: registeredKeys,
- timeoutSeconds: timeoutSeconds,
- requestId: reqId
- };
- };
-
-/**
- * Format and return a register request compliant with the JS API version supported by the extension..
- * @param {Array} signRequests
- * @param {Array} signRequests
- * @param {number} timeoutSeconds
- * @param {number} reqId
- * @return {Object}
- */
-u2f.formatRegisterRequest_ =
- function(appId, registeredKeys, registerRequests, timeoutSeconds, reqId) {
- if (js_api_version === undefined || js_api_version < 1.1) {
- // Adapt request to the 1.0 JS API
- for (var i = 0; i < registerRequests.length; i++) {
- registerRequests[i].appId = appId;
- }
- var signRequests = [];
- for (var i = 0; i < registeredKeys.length; i++) {
- signRequests[i] = {
- version: registeredKeys[i].version,
- challenge: registerRequests[0],
- keyHandle: registeredKeys[i].keyHandle,
- appId: appId
- };
- }
- return {
- type: u2f.MessageTypes.U2F_REGISTER_REQUEST,
- signRequests: signRequests,
- registerRequests: registerRequests,
- timeoutSeconds: timeoutSeconds,
- requestId: reqId
- };
- }
- // JS 1.1 API
- return {
- type: u2f.MessageTypes.U2F_REGISTER_REQUEST,
- appId: appId,
- registerRequests: registerRequests,
- registeredKeys: registeredKeys,
- timeoutSeconds: timeoutSeconds,
- requestId: reqId
- };
- };
-
-
-/**
- * Posts a message on the underlying channel.
- * @param {Object} message
- */
-u2f.WrappedChromeRuntimePort_.prototype.postMessage = function(message) {
- this.port_.postMessage(message);
-};
-
-
-/**
- * Emulates the HTML 5 addEventListener interface. Works only for the
- * onmessage event, which is hooked up to the chrome.runtime.Port.onMessage.
- * @param {string} eventName
- * @param {function({data: Object})} handler
- */
-u2f.WrappedChromeRuntimePort_.prototype.addEventListener =
- function(eventName, handler) {
- var name = eventName.toLowerCase();
- if (name == 'message' || name == 'onmessage') {
- this.port_.onMessage.addListener(function(message) {
- // Emulate a minimal MessageEvent object
- handler({'data': message});
- });
- } else {
- console.error('WrappedChromeRuntimePort only supports onMessage');
- }
- };
-
-/**
- * Wrap the Authenticator app with a MessagePort interface.
- * @constructor
- * @private
- */
-u2f.WrappedAuthenticatorPort_ = function() {
- this.requestId_ = -1;
- this.requestObject_ = null;
-};
-
-/**
- * Launch the Authenticator intent.
- * @param {Object} message
- */
-u2f.WrappedAuthenticatorPort_.prototype.postMessage = function(message) {
- var intentUrl =
- u2f.WrappedAuthenticatorPort_.INTENT_URL_BASE_ +
- ';S.request=' + encodeURIComponent(JSON.stringify(message)) +
- ';end';
- document.location = intentUrl;
-};
-
-/**
- * Tells what type of port this is.
- * @return {String} port type
- */
-u2f.WrappedAuthenticatorPort_.prototype.getPortType = function() {
- return "WrappedAuthenticatorPort_";
-};
-
-
-/**
- * Emulates the HTML 5 addEventListener interface.
- * @param {string} eventName
- * @param {function({data: Object})} handler
- */
-u2f.WrappedAuthenticatorPort_.prototype.addEventListener = function(eventName, handler) {
- var name = eventName.toLowerCase();
- if (name == 'message') {
- var self = this;
- /* Register a callback to that executes when
- * chrome injects the response. */
- window.addEventListener(
- 'message', self.onRequestUpdate_.bind(self, handler), false);
- } else {
- console.error('WrappedAuthenticatorPort only supports message');
- }
-};
-
-/**
- * Callback invoked when a response is received from the Authenticator.
- * @param function({data: Object}) callback
- * @param {Object} message message Object
- */
-u2f.WrappedAuthenticatorPort_.prototype.onRequestUpdate_ =
- function(callback, message) {
- var messageObject = JSON.parse(message.data);
- var intentUrl = messageObject['intentURL'];
-
- var errorCode = messageObject['errorCode'];
- var responseObject = null;
- if (messageObject.hasOwnProperty('data')) {
- responseObject = /** @type {Object} */ (
- JSON.parse(messageObject['data']));
- }
-
- callback({'data': responseObject});
- };
-
-/**
- * Base URL for intents to Authenticator.
- * @const
- * @private
- */
-u2f.WrappedAuthenticatorPort_.INTENT_URL_BASE_ =
- 'intent:#Intent;action=com.google.android.apps.authenticator.AUTHENTICATE';
-
-/**
- * Wrap the iOS client app with a MessagePort interface.
- * @constructor
- * @private
- */
-u2f.WrappedIosPort_ = function() {};
-
-/**
- * Launch the iOS client app request
- * @param {Object} message
- */
-u2f.WrappedIosPort_.prototype.postMessage = function(message) {
- var str = JSON.stringify(message, undefined, 2);
- var url = "u2f://auth?" + encodeURI(str);
- location.replace(url);
-};
-
-/**
- * Tells what type of port this is.
- * @return {String} port type
- */
-u2f.WrappedIosPort_.prototype.getPortType = function() {
- return "WrappedIosPort_";
-};
-
-/**
- * Emulates the HTML 5 addEventListener interface.
- * @param {string} eventName
- * @param {function({data: Object})} handler
- */
-u2f.WrappedIosPort_.prototype.addEventListener = function(eventName, handler) {
- var name = eventName.toLowerCase();
- if (name !== 'message') {
- console.error('WrappedIosPort only supports message');
- }
-};
-
-/**
- * Sets up an embedded trampoline iframe, sourced from the extension.
- * @param {function(MessagePort)} callback
- * @private
- */
-u2f.getIframePort_ = function(callback) {
- // Create the iframe
- var iframeOrigin = 'chrome-extension://' + u2f.EXTENSION_ID;
- var iframe = document.createElement('iframe');
- iframe.src = iframeOrigin + '/u2f-comms.html';
- iframe.setAttribute('style', 'display:none');
- document.body.appendChild(iframe);
-
- var channel = new MessageChannel();
- var ready = function(message) {
- if (message.data == 'ready') {
- channel.port1.removeEventListener('message', ready);
- callback(channel.port1);
- } else {
- console.error('First event on iframe port was not "ready"');
- }
- };
- channel.port1.addEventListener('message', ready);
- channel.port1.start();
-
- iframe.addEventListener('load', function() {
- // Deliver the port to the iframe and initialize
- iframe.contentWindow.postMessage('init', iframeOrigin, [channel.port2]);
- });
-};
-
-
-//High-level JS API
-
-/**
- * Default extension response timeout in seconds.
- * @const
- */
-u2f.EXTENSION_TIMEOUT_SEC = 30;
-
-/**
- * A singleton instance for a MessagePort to the extension.
- * @type {MessagePort|u2f.WrappedChromeRuntimePort_}
- * @private
- */
-u2f.port_ = null;
-
-/**
- * Callbacks waiting for a port
- * @type {Array}
- * @private
- */
-u2f.waitingForPort_ = [];
-
-/**
- * A counter for requestIds.
- * @type {number}
- * @private
- */
-u2f.reqCounter_ = 0;
-
-/**
- * A map from requestIds to client callbacks
- * @type {Object.}
- * @private
- */
-u2f.callbackMap_ = {};
-
-/**
- * Creates or retrieves the MessagePort singleton to use.
- * @param {function((MessagePort|u2f.WrappedChromeRuntimePort_))} callback
- * @private
- */
-u2f.getPortSingleton_ = function(callback) {
- if (u2f.port_) {
- callback(u2f.port_);
- } else {
- if (u2f.waitingForPort_.length == 0) {
- u2f.getMessagePort(function(port) {
- u2f.port_ = port;
- u2f.port_.addEventListener('message',
- /** @type {function(Event)} */ (u2f.responseHandler_));
-
- // Careful, here be async callbacks. Maybe.
- while (u2f.waitingForPort_.length)
- u2f.waitingForPort_.shift()(u2f.port_);
- });
- }
- u2f.waitingForPort_.push(callback);
- }
-};
-
-/**
- * Handles response messages from the extension.
- * @param {MessageEvent.} message
- * @private
- */
-u2f.responseHandler_ = function(message) {
- var response = message.data;
- var reqId = response['requestId'];
- if (!reqId || !u2f.callbackMap_[reqId]) {
- console.error('Unknown or missing requestId in response.');
- return;
- }
- var cb = u2f.callbackMap_[reqId];
- delete u2f.callbackMap_[reqId];
- cb(response['responseData']);
-};
-
-/**
- * Dispatches an array of sign requests to available U2F tokens.
- * If the JS API version supported by the extension is unknown, it first sends a
- * message to the extension to find out the supported API version and then it sends
- * the sign request.
- * @param {string=} appId
- * @param {string=} challenge
- * @param {Array} registeredKeys
- * @param {function((u2f.Error|u2f.SignResponse))} callback
- * @param {number=} opt_timeoutSeconds
- */
-u2f.sign = function(appId, challenge, registeredKeys, callback, opt_timeoutSeconds) {
- if (js_api_version === undefined) {
- // Send a message to get the extension to JS API version, then send the actual sign request.
- u2f.getApiVersion(
- function (response) {
- js_api_version = response['js_api_version'] === undefined ? 0 : response['js_api_version'];
- console.log("Extension JS API Version: ", js_api_version);
- u2f.sendSignRequest(appId, challenge, registeredKeys, callback, opt_timeoutSeconds);
- });
- } else {
- // We know the JS API version. Send the actual sign request in the supported API version.
- u2f.sendSignRequest(appId, challenge, registeredKeys, callback, opt_timeoutSeconds);
- }
-};
-
-/**
- * Dispatches an array of sign requests to available U2F tokens.
- * @param {string=} appId
- * @param {string=} challenge
- * @param {Array} registeredKeys
- * @param {function((u2f.Error|u2f.SignResponse))} callback
- * @param {number=} opt_timeoutSeconds
- */
-u2f.sendSignRequest = function(appId, challenge, registeredKeys, callback, opt_timeoutSeconds) {
- u2f.getPortSingleton_(function(port) {
- var reqId = ++u2f.reqCounter_;
- u2f.callbackMap_[reqId] = callback;
- var timeoutSeconds = (typeof opt_timeoutSeconds !== 'undefined' ?
- opt_timeoutSeconds : u2f.EXTENSION_TIMEOUT_SEC);
- var req = u2f.formatSignRequest_(appId, challenge, registeredKeys, timeoutSeconds, reqId);
- port.postMessage(req);
- });
-};
-
-/**
- * Dispatches register requests to available U2F tokens. An array of sign
- * requests identifies already registered tokens.
- * If the JS API version supported by the extension is unknown, it first sends a
- * message to the extension to find out the supported API version and then it sends
- * the register request.
- * @param {string=} appId
- * @param {Array} registerRequests
- * @param {Array} registeredKeys
- * @param {function((u2f.Error|u2f.RegisterResponse))} callback
- * @param {number=} opt_timeoutSeconds
- */
-u2f.register = function(appId, registerRequests, registeredKeys, callback, opt_timeoutSeconds) {
- if (js_api_version === undefined) {
- // Send a message to get the extension to JS API version, then send the actual register request.
- u2f.getApiVersion(
- function (response) {
- js_api_version = response['js_api_version'] === undefined ? 0: response['js_api_version'];
- console.log("Extension JS API Version: ", js_api_version);
- u2f.sendRegisterRequest(appId, registerRequests, registeredKeys,
- callback, opt_timeoutSeconds);
- });
- } else {
- // We know the JS API version. Send the actual register request in the supported API version.
- u2f.sendRegisterRequest(appId, registerRequests, registeredKeys,
- callback, opt_timeoutSeconds);
- }
-};
-
-/**
- * Dispatches register requests to available U2F tokens. An array of sign
- * requests identifies already registered tokens.
- * @param {string=} appId
- * @param {Array} registerRequests
- * @param {Array} registeredKeys
- * @param {function((u2f.Error|u2f.RegisterResponse))} callback
- * @param {number=} opt_timeoutSeconds
- */
-u2f.sendRegisterRequest = function(appId, registerRequests, registeredKeys, callback, opt_timeoutSeconds) {
- u2f.getPortSingleton_(function(port) {
- var reqId = ++u2f.reqCounter_;
- u2f.callbackMap_[reqId] = callback;
- var timeoutSeconds = (typeof opt_timeoutSeconds !== 'undefined' ?
- opt_timeoutSeconds : u2f.EXTENSION_TIMEOUT_SEC);
- var req = u2f.formatRegisterRequest_(
- appId, registeredKeys, registerRequests, timeoutSeconds, reqId);
- port.postMessage(req);
- });
-};
-
-
-/**
- * Dispatches a message to the extension to find out the supported
- * JS API version.
- * If the user is on a mobile phone and is thus using Google Authenticator instead
- * of the Chrome extension, don't send the request and return 0.
- * @param {function((u2f.Error|u2f.GetJsApiVersionResponse))} callback
- * @param {number=} opt_timeoutSeconds
- */
-u2f.getApiVersion = function(callback, opt_timeoutSeconds) {
- u2f.getPortSingleton_(function(port) {
- // If we are using Android Google Authenticator or iOS client app,
- // do not fire an intent to ask which JS API version to use.
- if (port.getPortType) {
- var apiVersion;
- switch (port.getPortType()) {
- case 'WrappedIosPort_':
- case 'WrappedAuthenticatorPort_':
- apiVersion = 1.1;
- break;
-
- default:
- apiVersion = 0;
- break;
- }
- callback({ 'js_api_version': apiVersion });
- return;
- }
- var reqId = ++u2f.reqCounter_;
- u2f.callbackMap_[reqId] = callback;
- var req = {
- type: u2f.MessageTypes.U2F_GET_API_VERSION_REQUEST,
- timeoutSeconds: (typeof opt_timeoutSeconds !== 'undefined' ?
- opt_timeoutSeconds : u2f.EXTENSION_TIMEOUT_SEC),
- requestId: reqId
- };
- port.postMessage(req);
- });
-};
diff --git a/cas/src/main/resources/static/assets/js/webauthn/webauthn.js b/cas/src/main/resources/static/assets/js/webauthn/webauthn.js
deleted file mode 100644
index 46d0a339..00000000
--- a/cas/src/main/resources/static/assets/js/webauthn/webauthn.js
+++ /dev/null
@@ -1,581 +0,0 @@
-/**********************************
- * Base64 Core
- **********************************/
-(function (root, factory) {
- if (typeof define === 'function' && define.amd) {
- define(['base64js'], factory);
- } else if (typeof module === 'object' && module.exports) {
- module.exports = factory(require('base64js'));
- } else {
- root.base64url = factory(root.base64js);
- }
-})(this, function (base64js) {
-
- function ensureUint8Array(arg) {
- if (arg instanceof ArrayBuffer) {
- return new Uint8Array(arg);
- } else {
- return arg;
- }
- }
-
- function base64UrlToMime(code) {
- return code.replace(/-/g, '+').replace(/_/g, '/') + '===='.substring(0, (4 - (code.length % 4)) % 4);
- }
-
- function mimeBase64ToUrl(code) {
- return code.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
- }
-
- function fromByteArray(bytes) {
- return mimeBase64ToUrl(base64js.fromByteArray(ensureUint8Array(bytes)));
- }
-
- function toByteArray(code) {
- return base64js.toByteArray(base64UrlToMime(code));
- }
-
- return {
- fromByteArray: fromByteArray,
- toByteArray: toByteArray,
- };
-
-});
-
-
-/*******************************************************
- * WebAuthN Core
- *******************************************************/
-
-(function (root, factory) {
- if (typeof define === 'function' && define.amd) {
- define(['base64url'], factory);
- } else if (typeof module === 'object' && module.exports) {
- module.exports = factory(require('base64url'));
- } else {
- root.webauthn = factory(root.base64url);
- }
-})(this, function (base64url) {
-
- function extend(obj, more) {
- return Object.assign({}, obj, more);
- }
-
- /**
- * Create a WebAuthn credential.
- *
- * @param request: object - A PublicKeyCredentialCreationOptions object, except
- * where binary values are base64url encoded strings instead of byte arrays
- *
- * @return a PublicKeyCredentialCreationOptions suitable for passing as the
- * `publicKey` parameter to `navigator.credentials.create()`
- */
- function decodePublicKeyCredentialCreationOptions(request) {
- const excludeCredentials = request.excludeCredentials.map(credential => extend(
- credential, {
- id: base64url.toByteArray(credential.id),
- }));
-
- const publicKeyCredentialCreationOptions = extend(
- request, {
- attestation: 'direct',
- user: extend(
- request.user, {
- id: base64url.toByteArray(request.user.id),
- }),
- challenge: base64url.toByteArray(request.challenge),
- excludeCredentials,
- });
-
- return publicKeyCredentialCreationOptions;
- }
-
- /**
- * Create a WebAuthn credential.
- *
- * @param request: object - A PublicKeyCredentialCreationOptions object, except
- * where binary values are base64url encoded strings instead of byte arrays
- *
- * @return the Promise returned by `navigator.credentials.create`
- */
- function createCredential(request) {
- return navigator.credentials.create({
- publicKey: decodePublicKeyCredentialCreationOptions(request),
- });
- }
-
- /**
- * Perform a WebAuthn assertion.
- *
- * @param request: object - A PublicKeyCredentialRequestOptions object,
- * except where binary values are base64url encoded strings instead of byte
- * arrays
- *
- * @return a PublicKeyCredentialRequestOptions suitable for passing as the
- * `publicKey` parameter to `navigator.credentials.get()`
- */
- function decodePublicKeyCredentialRequestOptions(request) {
- const allowCredentials = request.allowCredentials && request.allowCredentials.map(credential => extend(
- credential, {
- id: base64url.toByteArray(credential.id),
- }));
-
- const publicKeyCredentialRequestOptions = extend(
- request, {
- allowCredentials,
- challenge: base64url.toByteArray(request.challenge),
- });
-
- return publicKeyCredentialRequestOptions;
- }
-
- /**
- * Perform a WebAuthn assertion.
- *
- * @param request: object - A PublicKeyCredentialRequestOptions object,
- * except where binary values are base64url encoded strings instead of byte
- * arrays
- *
- * @return the Promise returned by `navigator.credentials.get`
- */
- function getAssertion(request) {
- console.log('Get assertion', request);
- return navigator.credentials.get({
- publicKey: decodePublicKeyCredentialRequestOptions(request),
- });
- }
-
-
- /** Turn a PublicKeyCredential object into a plain object with base64url encoded binary values */
- function responseToObject(response) {
- if (response.u2fResponse) {
- return response;
- } else {
- let clientExtensionResults = {};
-
- try {
- clientExtensionResults = response.getClientExtensionResults();
- } catch (e) {
- console.error('getClientExtensionResults failed', e);
- }
-
- if (response.response.attestationObject) {
- return {
- type: response.type,
- id: response.id,
- response: {
- attestationObject: base64url.fromByteArray(response.response.attestationObject),
- clientDataJSON: base64url.fromByteArray(response.response.clientDataJSON),
- },
- clientExtensionResults,
- };
- } else {
- return {
- type: response.type,
- id: response.id,
- response: {
- authenticatorData: base64url.fromByteArray(response.response.authenticatorData),
- clientDataJSON: base64url.fromByteArray(response.response.clientDataJSON),
- signature: base64url.fromByteArray(response.response.signature),
- userHandle: response.response.userHandle && base64url.fromByteArray(response.response.userHandle),
- },
- clientExtensionResults,
- };
- }
- }
- }
-
- return {
- decodePublicKeyCredentialCreationOptions,
- decodePublicKeyCredentialRequestOptions,
- createCredential,
- getAssertion,
- responseToObject,
- };
-
-});
-
-
-/*****************************************************
- * WebAuthn Utilities
- *****************************************************/
-
-let ceremonyState = {};
-let session = {};
-
-function extend(obj, more) {
- return Object.assign({}, obj, more);
-}
-
-function rejectIfNotSuccess(response) {
- if (response.success) {
- return response;
- }
- return new Promise((resolve, reject) => reject(response));
-}
-
-function updateSession(response) {
- if (response.sessionToken) {
- session.sessionToken = response.sessionToken;
- } else {
- session.sessionToken = null;
- }
- if (response.username) {
- session.username = response.username;
- } else {
- session.username = null;
- }
- updateSessionBox();
- return response;
-}
-
-function logout() {
- session = {};
- updateSession({});
-}
-
-function updateSessionBox() {
- const disabled = session.username == null || session.username === '';
- $('#logoutButton').prop('disabled', disabled);
-}
-
-function rejected(err) {
- return new Promise((resolve, reject) => reject(err));
-}
-
-function setStatus(statusText) {
- $('#status').val(statusText);
-}
-
-function addDeviceAttributeAsRow(name, value) {
- let row = ``
- + `${name}${value} `;
- $('#deviceTable tbody').append(row);
-}
-
-function addMessage(message) {
- $('#messages').html("" + message + "
");
-}
-
-function addMessages(messages) {
- messages.forEach(addMessage);
-}
-
-function showJson(name, data) {
- if (data != null) {
- $('#' + name).text(JSON.stringify(data, false, 4));
- }
-}
-
-function showRequest(data) {
- return showJson('request', data);
-}
-
-function showAuthenticatorResponse(data) {
- const clientDataJson = data && (data.response && data.response.clientDataJSON);
- return showJson('authenticator-response', extend(
- data, {
- _clientDataJson: data && JSON.parse(new TextDecoder('utf-8').decode(base64url.toByteArray(clientDataJson))),
- }));
-}
-
-function showServerResponse(data) {
- if (data && data.messages) {
- addMessages(data.messages);
- }
- return showJson('server-response', data);
-}
-
-function hideDeviceInfo() {
- $("#device-info").hide();
- $("#registerButton").show();
- $("#registerDiscoverableCredentialButton").show();
-}
-
-function showDeviceInfo(params) {
- $("#device-info").show();
- $("#device-name").text(params.displayName);
- $("#device-icon").attr("src", params.imageUrl);
- $("#registerButton").hide();
- $("#deviceNamePanel").hide();
-
- $("#registerDiscoverableCredentialButton").hide();
- $("#residentKeysPanel").hide();
-}
-
-function resetDisplays() {
- /*
- showRequest(null);
- showAuthenticatorResponse(null);
- showServerResponse(null);
- */
- hideDeviceInfo();
-}
-
-function getWebAuthnUrls() {
- let endpoints = {
- authenticate: "webauthn/authenticate",
- register: "webauthn/register",
- };
- return new Promise((resolve, reject) => resolve(endpoints)).then(data => {
- return data;
- });
-}
-
-function getRegisterRequest(urls,
- username,
- displayName,
- credentialNickname,
- requireResidentKey = false) {
- return fetch(urls.register, {
- body: new URLSearchParams({
- username,
- displayName,
- credentialNickname,
- requireResidentKey,
- sessionToken: session.sessionToken || null,
- }),
- headers: {
- "X-CSRF-TOKEN": csrfToken
- },
- method: 'POST',
- })
- .then(response => response.json())
- .then(updateSession)
- .then(rejectIfNotSuccess);
-}
-
-function executeRegisterRequest(request) {
- return webauthn.createCredential(request.publicKeyCredentialCreationOptions);
-}
-
-function submitResponse(url, request, response) {
- const body = {
- requestId: request.requestId,
- credential: response,
- sessionToken: request.sessionToken || session.sessionToken || null,
- };
-
- return fetch(url, {
- method: 'POST',
- headers: {
- "X-CSRF-TOKEN": csrfToken
- },
- body: JSON.stringify(body),
- })
- .then(response => response.json())
- .then(updateSession);
-}
-
-function performCeremony(params) {
- const callbacks = params.callbacks || {};
- const getWebAuthnUrls = params.getWebAuthnUrls;
- const getRequest = params.getRequest;
- const statusStrings = params.statusStrings;
- const executeRequest = params.executeRequest;
-
- resetDisplays();
-
- return getWebAuthnUrls()
- .then(urls => {
- setStatus(statusStrings.int);
- if (callbacks.init) {
- callbacks.init(urls);
- }
- return getRequest(urls);
- })
-
- .then((params) => {
- const request = params.request;
- const urls = params.actions;
- setStatus(statusStrings.authenticatorRequest);
- if (callbacks.authenticatorRequest) {
- callbacks.authenticatorRequest({request, urls});
- }
- showRequest(request);
- ceremonyState = {
- callbacks,
- request,
- statusStrings,
- urls
- };
- return executeRequest(request)
- .then(webauthn.responseToObject);
- })
- .then(finishCeremony);
-}
-
-function finishCeremony(response) {
- const callbacks = ceremonyState.callbacks;
- const request = ceremonyState.request;
- const statusStrings = ceremonyState.statusStrings;
- const urls = ceremonyState.urls;
-
- setStatus(statusStrings.serverRequest || 'Sending response to server...');
- if (callbacks.serverRequest) {
- callbacks.serverRequest({urls, request, response});
- }
- showAuthenticatorResponse(response);
-
- return submitResponse(urls.finish, request, response)
- .then(data => {
- if (data && data.success) {
- setStatus(statusStrings.success);
- } else {
- setStatus('Error');
- }
- showServerResponse(data);
- return data;
- });
-}
-
-function register(username, displayName, credentialNickname, csrfToken,
- requireResidentKey = false,
- getRequest = getRegisterRequest) {
- let request;
- return performCeremony({
- getWebAuthnUrls,
- getRequest: urls => getRequest(urls, username, displayName, credentialNickname, requireResidentKey),
- statusStrings: {
- init: 'Initiating registration ceremony with server...',
- authenticatorRequest: 'Asking authenticators to create credential...',
- success: 'Registration successful.',
- },
- executeRequest: req => {
- request = req;
- return executeRegisterRequest(req);
- }
- })
- .then(data => {
- if (data.registration) {
- const nicknameInfo = {nickname: data.registration.credentialNickname};
-
- if (data.registration && data.registration.attestationMetadata) {
- showDeviceInfo(extend(
- data.registration.attestationMetadata.deviceProperties,
- nicknameInfo
- ));
- } else {
- showDeviceInfo(nicknameInfo);
- }
-
- if (!data.attestationTrusted) {
- addMessage("Attestation cannot be trusted.");
- } else {
- setTimeout(function () {
- $('#sessionToken').val(session.sessionToken);
- console.log("Submitting registration form");
- $('#form').submit();
- }, 1500);
- }
- }
- })
- .catch((err) => {
- setStatus('Registration failed.');
- console.error('Registration failed', err);
-
- if (err.name === 'NotAllowedError') {
- if (request.publicKeyCredentialCreationOptions.excludeCredentials
- && request.publicKeyCredentialCreationOptions.excludeCredentials.length > 0
- ) {
- addMessage('Credential creation failed, probably because an already registered credential is available.');
- } else {
- addMessage('Credential creation failed for an unknown reason.');
- }
- } else if (err.name === 'InvalidStateError') {
- addMessage(`This authenticator is already registered for the account "${username}".`)
- } else if (err.message) {
- addMessage(`${err.message}`);
- } else if (err.messages) {
- addMessages(err.messages);
- }
- return rejected(err);
- });
-}
-
-function getAuthenticateRequest(urls, username) {
- return fetch(urls.authenticate, {
- body: new URLSearchParams(username ? {username} : {}),
- headers: {
- "X-CSRF-TOKEN": csrfToken
- },
- method: 'POST',
- })
- .then(response => response.json())
- .then(updateSession)
- .then(rejectIfNotSuccess);
-}
-
-function executeAuthenticateRequest(request) {
- console.log('Sending authentication request', request);
- return webauthn.getAssertion(request.publicKeyCredentialRequestOptions);
-}
-
-function authenticate(username = null, getRequest = getAuthenticateRequest) {
- $('#deviceTable tbody tr').remove();
- $('#divDeviceInfo').hide();
- hideDeviceInfo();
-
- return performCeremony({
- getWebAuthnUrls,
- getRequest: urls => getRequest(urls, username),
- statusStrings: {
- init: 'Initiating authentication ceremony...',
- authenticatorRequest: 'Asking authenticators to perform assertion...',
- success: 'Authentication successful.',
- },
- executeRequest: executeAuthenticateRequest,
- }).then(data => {
- $('#divDeviceInfo').show();
- console.log("Received: " + JSON.stringify(data, undefined, 2));
- if (data.registrations) {
-
- data.registrations.forEach(reg => {
-
- addDeviceAttributeAsRow("Username", reg.username);
- addDeviceAttributeAsRow("Credential Nickname", reg.credentialNickname);
- addDeviceAttributeAsRow("Registration Date", reg.registrationTime);
- addDeviceAttributeAsRow("Session Token", data.sessionToken);
- if (reg.attestationMetadata.deviceProperties) {
- addDeviceAttributeAsRow("Device Id", reg.attestationMetadata.deviceProperties.deviceId);
- addDeviceAttributeAsRow("Device Name", reg.attestationMetadata.deviceProperties.displayName);
-
- showDeviceInfo({
- "displayName": reg.attestationMetadata.deviceProperties.displayName,
- "imageUrl": reg.attestationMetadata.deviceProperties.imageUrl
- })
- }
- });
-
- $('#authnButton').hide();
-
- setTimeout(function () {
- $('#token').val(data.sessionToken);
- console.log("Submitting authentication form");
- $('#webauthnLoginForm').submit();
- }, 1500);
- }
- return data;
- }).catch((err) => {
- setStatus(authFailTitle);
- if (err.name === 'InvalidStateError') {
- addMessage(`This authenticator is not registered for the account "${username}".`)
- } else if (err.message) {
- addMessage(`${err.name}: ${err.message}`);
- } else if (err.messages) {
- addMessages(err.messages);
- }
- console.error('Authentication failed', err);
- addMessage(authFailDesc);
- return rejected(err);
- });
-}
-
-function init() {
- hideDeviceInfo();
- return false;
-}
-
-window.onload = init;
diff --git a/cas/src/main/resources/views/acceptto/casAccepttoRegistrationView.html b/cas/src/main/resources/views/acceptto/casAccepttoRegistrationView.html
deleted file mode 100644
index e4bed8d2..00000000
--- a/cas/src/main/resources/views/acceptto/casAccepttoRegistrationView.html
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
- Acceptto Registration View
-
-
-
Register Device
-
-
- Open the app store and search for "Acceptto It's Me".
- Install the "Acceptto It's Me" application.
- Open the application and follow the instructions to access the QR Code scanner.
- Scan this QR Code.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Waiting for device registration notification...
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/acct-mgmt/casAccountSignupView.html b/cas/src/main/resources/views/acct-mgmt/casAccountSignupView.html
deleted file mode 100644
index dbc1f4ae..00000000
--- a/cas/src/main/resources/views/acct-mgmt/casAccountSignupView.html
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/acct-mgmt/casAccountSignupViewComplete.html b/cas/src/main/resources/views/acct-mgmt/casAccountSignupViewComplete.html
deleted file mode 100644
index edce07c5..00000000
--- a/cas/src/main/resources/views/acct-mgmt/casAccountSignupViewComplete.html
+++ /dev/null
@@ -1,215 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/acct-mgmt/casAccountSignupViewCompleted.html b/cas/src/main/resources/views/acct-mgmt/casAccountSignupViewCompleted.html
deleted file mode 100644
index 8cf2eceb..00000000
--- a/cas/src/main/resources/views/acct-mgmt/casAccountSignupViewCompleted.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/acct-mgmt/casAccountSignupViewSentInfo.html b/cas/src/main/resources/views/acct-mgmt/casAccountSignupViewSentInfo.html
deleted file mode 100644
index 3e792899..00000000
--- a/cas/src/main/resources/views/acct-mgmt/casAccountSignupViewSentInfo.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/acct/casMyAccountProfile.html b/cas/src/main/resources/views/acct/casMyAccountProfile.html
deleted file mode 100644
index 6900b1d2..00000000
--- a/cas/src/main/resources/views/acct/casMyAccountProfile.html
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/adaptive-authn/casRiskAuthenticationBlockedView.html b/cas/src/main/resources/views/adaptive-authn/casRiskAuthenticationBlockedView.html
deleted file mode 100644
index 55f7e810..00000000
--- a/cas/src/main/resources/views/adaptive-authn/casRiskAuthenticationBlockedView.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
- Risk Authentication Blocked View
-
-
-
Authentication attempt is blocked.
-
Your authentication attempt is untrusted and unauthorized from your
- current workstation.
-
-
-
diff --git a/cas/src/main/resources/views/admin/casAdminLoginView.html b/cas/src/main/resources/views/admin/casAdminLoginView.html
deleted file mode 100644
index 39ba5a85..00000000
--- a/cas/src/main/resources/views/admin/casAdminLoginView.html
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
- CAS Admin Login View
-
-
-
-
-
diff --git a/cas/src/main/resources/views/aup/casAcceptableUsagePolicyView.html b/cas/src/main/resources/views/aup/casAcceptableUsagePolicyView.html
deleted file mode 100644
index cc7274e7..00000000
--- a/cas/src/main/resources/views/aup/casAcceptableUsagePolicyView.html
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/authy/casAuthyLoginView.html b/cas/src/main/resources/views/authy/casAuthyLoginView.html
deleted file mode 100644
index 3a42544a..00000000
--- a/cas/src/main/resources/views/authy/casAuthyLoginView.html
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
- Authy Login View
-
-
-
-
-
diff --git a/cas/src/main/resources/views/consent/casConsentView.html b/cas/src/main/resources/views/consent/casConsentView.html
deleted file mode 100644
index 3a2afce6..00000000
--- a/cas/src/main/resources/views/consent/casConsentView.html
+++ /dev/null
@@ -1,267 +0,0 @@
-
-
-
-
- Consent View
-
-
-
Attribute Consent
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/forgot-username/casForgotUsernameSentInfoView.html b/cas/src/main/resources/views/forgot-username/casForgotUsernameSentInfoView.html
deleted file mode 100644
index e1f4b90a..00000000
--- a/cas/src/main/resources/views/forgot-username/casForgotUsernameSentInfoView.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- Forgot Username Instructions View
-
-
-
Instructions Sent Successfully.
-
You should shortly receive an email with
- follow-instructions to how to retrieve your username.
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/accepttoQRCode.html b/cas/src/main/resources/views/fragments/accepttoQRCode.html
deleted file mode 100644
index 12d46f78..00000000
--- a/cas/src/main/resources/views/fragments/accepttoQRCode.html
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
- loginProviders Fragment
-
-
-
-
-
-
-
-
-
-
-
- Login with QR Code
-
-
Scan the QR code below, receive a push notification on your device. Approve and sign in!
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/accountprofileapplications.html b/cas/src/main/resources/views/fragments/accountprofileapplications.html
deleted file mode 100644
index 465f0116..00000000
--- a/cas/src/main/resources/views/fragments/accountprofileapplications.html
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
- Account Profile
-
-
-
-
-
-
-
- Hello,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/accountprofileattributes.html b/cas/src/main/resources/views/fragments/accountprofileattributes.html
deleted file mode 100644
index 2f989194..00000000
--- a/cas/src/main/resources/views/fragments/accountprofileattributes.html
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
- Account Profile
-
-
-
-
-
- Hello,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/accountprofileauditlog.html b/cas/src/main/resources/views/fragments/accountprofileauditlog.html
deleted file mode 100644
index 76df2b7a..00000000
--- a/cas/src/main/resources/views/fragments/accountprofileauditlog.html
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-
-
- Account Profile
-
-
-
-
-
-
-
- Audit Entry Details
-
-
-
Here are the details for this audit record entry.
-
Text
-
-
-
-
-
-
-
- Audit Log
-
-
Examine the CAS audit log here.
-
-
-
-
-
-
-
-
- ValueValue
-
- Value
-
- Value
- Value
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/accountprofileconsent.html b/cas/src/main/resources/views/fragments/accountprofileconsent.html
deleted file mode 100644
index b9bf27b9..00000000
--- a/cas/src/main/resources/views/fragments/accountprofileconsent.html
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
- Account Profile
-
-
-
-
-
-
-
- Attribute Consent Entry Details
-
-
-
Here are the details for this attribute-consent record entry.
-
Text
-
-
-
-
-
-
-
- Attribute Consent Decisions
-
-
Examine the CAS Attribute Consent Decisions here.
-
-
-
-
-
-
-
-
- ValueValue
- Value
-
- Value
-
- Value
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/accountprofilemfadevices.html b/cas/src/main/resources/views/fragments/accountprofilemfadevices.html
deleted file mode 100644
index 1f1c4ed3..00000000
--- a/cas/src/main/resources/views/fragments/accountprofilemfadevices.html
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
- Account Profile
-
-
-
-
-
-
-
- Entry Details
-
-
-
Here are the details for this record entry.
-
Text
-
-
-
-
-
-
-
- MFA Devices
-
-
MFA Devices are listed here
-
-
-
-
-
-
-
- Value
- ValueValue
- Value
- Value
- Value
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/accountprofilenavigation.html b/cas/src/main/resources/views/fragments/accountprofilenavigation.html
deleted file mode 100644
index 95d0f63f..00000000
--- a/cas/src/main/resources/views/fragments/accountprofilenavigation.html
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
- Account Profile
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/accountprofileoverview.html b/cas/src/main/resources/views/fragments/accountprofileoverview.html
deleted file mode 100644
index ba552976..00000000
--- a/cas/src/main/resources/views/fragments/accountprofileoverview.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
- Account Profile
-
-
-
- Hello,
-
-
You,
- username , have successfully logged into the Central Authentication Service.
-
- When you are finished, for security reasons, please log out and exit your web browser.
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/accountprofilesecurityquestions.html b/cas/src/main/resources/views/fragments/accountprofilesecurityquestions.html
deleted file mode 100644
index 1f14e031..00000000
--- a/cas/src/main/resources/views/fragments/accountprofilesecurityquestions.html
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
-
- Account Profile
-
-
-
-
-
-
- Security Questions
-
-
- You can review and update your security questions here.
-
-
-
-
Failure
- Message Text
-
-
- Message Text
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/accountprofilesessions.html b/cas/src/main/resources/views/fragments/accountprofilesessions.html
deleted file mode 100644
index 32170dcc..00000000
--- a/cas/src/main/resources/views/fragments/accountprofilesessions.html
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
- Account Profile
-
-
-
-
-
-
-
- Entry Details
-
-
-
Here are the details for this record entry.
-
Text
-
-
-
-
-
-
-
-
- Hello,
-
-
-
-
-
-
-
-
-
-
- Value
- Value
- Value
- Value
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/footer.html b/cas/src/main/resources/views/fragments/footer.html
deleted file mode 100644
index 6c83c109..00000000
--- a/cas/src/main/resources/views/fragments/footer.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/cas/src/main/resources/views/fragments/googleanalytics.html b/cas/src/main/resources/views/fragments/googleanalytics.html
deleted file mode 100644
index 93fafae9..00000000
--- a/cas/src/main/resources/views/fragments/googleanalytics.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
\ No newline at end of file
diff --git a/cas/src/main/resources/views/fragments/header.html b/cas/src/main/resources/views/fragments/header.html
deleted file mode 100644
index 51b6eeb4..00000000
--- a/cas/src/main/resources/views/fragments/header.html
+++ /dev/null
@@ -1,237 +0,0 @@
-
-
-
-
- Header Fragment
-
-
-
-
-
-
-
-
- CAS
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Unsure Connection
-
-
-
-
-
-
- Cookies are not supported by this browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/loginProviders.html b/cas/src/main/resources/views/fragments/loginProviders.html
deleted file mode 100644
index f91213fb..00000000
--- a/cas/src/main/resources/views/fragments/loginProviders.html
+++ /dev/null
@@ -1,179 +0,0 @@
-
-
-
-
- loginProviders Fragment
-
-
-
-
-
-
-
- External Identity Providers
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/logindrawer.html b/cas/src/main/resources/views/fragments/logindrawer.html
deleted file mode 100644
index 59a77dfe..00000000
--- a/cas/src/main/resources/views/fragments/logindrawer.html
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
- Login Sidebar Fragment
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/loginform.html b/cas/src/main/resources/views/fragments/loginform.html
deleted file mode 100644
index 78ec6c98..00000000
--- a/cas/src/main/resources/views/fragments/loginform.html
+++ /dev/null
@@ -1,360 +0,0 @@
-
-
-
-
- Login Form Fragment
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/loginsidebar.html b/cas/src/main/resources/views/fragments/loginsidebar.html
deleted file mode 100644
index b5218e9a..00000000
--- a/cas/src/main/resources/views/fragments/loginsidebar.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
- Login Sidebar Fragment
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/pmlinks.html b/cas/src/main/resources/views/fragments/pmlinks.html
deleted file mode 100644
index dcc0bbaf..00000000
--- a/cas/src/main/resources/views/fragments/pmlinks.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
- Password Management Links Fragment
-
-
-
-
-
- Forgot your password?
-
-
Password Update Form
-
-
-
-
- Change Password Heading
-
-
-
-
Expired/Must Change Password text
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/qrAuthentication.html b/cas/src/main/resources/views/fragments/qrAuthentication.html
deleted file mode 100644
index b516b174..00000000
--- a/cas/src/main/resources/views/fragments/qrAuthentication.html
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
- loginProviders Fragment
-
-
-
-
-
-
-
-
-
-
-
- Login with QR Code
-
-
-
Scan the QR code with your mobile device to begin the login flow. If your credentials
- are accepted, you will automatically proceed to the next step.
-
-
-
-
-
-
Your mobile device must communicate with CAS using the following channel id.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/recaptcha.html b/cas/src/main/resources/views/fragments/recaptcha.html
deleted file mode 100644
index 6c6c5db4..00000000
--- a/cas/src/main/resources/views/fragments/recaptcha.html
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
- Service UI Fragment
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/scripts.html b/cas/src/main/resources/views/fragments/scripts.html
deleted file mode 100644
index 85a5965e..00000000
--- a/cas/src/main/resources/views/fragments/scripts.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
- Theme fragment will go here
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/serviceui.html b/cas/src/main/resources/views/fragments/serviceui.html
deleted file mode 100644
index baef32e1..00000000
--- a/cas/src/main/resources/views/fragments/serviceui.html
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
- Service UI Fragment
-
-
-
-
-
-
-
-
-
serviceUIMetadata.description
-
-
- screen.mdui.infolink.text
-
- serviceUIMetadata.privacyStatementURL
-
-
-
-
-
-
-
-
Registered Service Description
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/submitbutton.html b/cas/src/main/resources/views/fragments/submitbutton.html
deleted file mode 100644
index 2def6574..00000000
--- a/cas/src/main/resources/views/fragments/submitbutton.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
- Service UI Fragment
-
-
-
-
- Login
-
-
-
-
-
- Login
-
-
-
-
-
-
-
-
-
-
-
-
-
- Login
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/fragments/unlockaccount.html b/cas/src/main/resources/views/fragments/unlockaccount.html
deleted file mode 100644
index 196ce804..00000000
--- a/cas/src/main/resources/views/fragments/unlockaccount.html
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Service UI Fragment
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Server Response
-
-
- Authenticator Response
-
-
- Request
-
-
-
-
-
-
Authenticator Response:
-
-
-
-
-
-
-
-
-
-
Login
-
-
-
- Error Message Text
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Login
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/gauth/casGoogleAuthenticatorConfirmRegistrationView.html b/cas/src/main/resources/views/gauth/casGoogleAuthenticatorConfirmRegistrationView.html
deleted file mode 100644
index b1b41891..00000000
--- a/cas/src/main/resources/views/gauth/casGoogleAuthenticatorConfirmRegistrationView.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
- Google Authentication Registration Review View
-
-
-
The following devices are registered for
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/gauth/casGoogleAuthenticatorLoginView.html b/cas/src/main/resources/views/gauth/casGoogleAuthenticatorLoginView.html
deleted file mode 100644
index 265797c6..00000000
--- a/cas/src/main/resources/views/gauth/casGoogleAuthenticatorLoginView.html
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
-
- Google Authentication View
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/gauth/casGoogleAuthenticatorRegistrationView.html b/cas/src/main/resources/views/gauth/casGoogleAuthenticatorRegistrationView.html
deleted file mode 100644
index 9412b7cf..00000000
--- a/cas/src/main/resources/views/gauth/casGoogleAuthenticatorRegistrationView.html
+++ /dev/null
@@ -1,195 +0,0 @@
-
-
-
-
- Google Authentication Registration Review View
-
-
-
Your account is not registered.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Secret key to register is...
-
Scratch codes:
-
-
-
-
-
-
-
- Confirm
-
-
- Print
-
-
- Cancel
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/gua/casGuaDisplayUserGraphicsView.html b/cas/src/main/resources/views/gua/casGuaDisplayUserGraphicsView.html
deleted file mode 100644
index 64b22f74..00000000
--- a/cas/src/main/resources/views/gua/casGuaDisplayUserGraphicsView.html
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
- Gua Display User Graphics View
-
-
-
-
guaUsername
-
-
- If you do not recognize this image as yours, do NOT continue.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/gua/casGuaGetUserIdView.html b/cas/src/main/resources/views/gua/casGuaGetUserIdView.html
deleted file mode 100644
index 7b418e53..00000000
--- a/cas/src/main/resources/views/gua/casGuaGetUserIdView.html
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
- Gua Get User Id View
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/interrupt/casInterruptView.html b/cas/src/main/resources/views/interrupt/casInterruptView.html
deleted file mode 100644
index 635df752..00000000
--- a/cas/src/main/resources/views/interrupt/casInterruptView.html
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-
-
- CAS Interrupt View
-
-
-
Authentication Interrupt
-
The authentication flow has been interrupted. CAS has
- not yet established a single sign-on session for {0} .
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/inwebo/casInweboCheckResultView.html b/cas/src/main/resources/views/inwebo/casInweboCheckResultView.html
deleted file mode 100644
index 9d8dc5d6..00000000
--- a/cas/src/main/resources/views/inwebo/casInweboCheckResultView.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
- Checking authentication...
-
-
-
Waiting for the notification to be approved...
-
Please validate it on your phone/desktop.
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/inwebo/casInweboErrorView.html b/cas/src/main/resources/views/inwebo/casInweboErrorView.html
deleted file mode 100644
index 1a6102ba..00000000
--- a/cas/src/main/resources/views/inwebo/casInweboErrorView.html
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
- Inwebo error
-
-
-
An Inwebo error has occured.
-
-
- Error Message Text
-
-
-
-
-
-
-
-
-
-
-
-
The enrollment failed
-
-
-
Bad code PIN confirmation
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/inwebo/casInweboMAAuthnView.html b/cas/src/main/resources/views/inwebo/casInweboMAAuthnView.html
deleted file mode 100644
index fe0915ae..00000000
--- a/cas/src/main/resources/views/inwebo/casInweboMAAuthnView.html
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
- Browser authentication
-
-
-
Fill in your PIN code:
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/inwebo/casInweboSelectAuthnView.html b/cas/src/main/resources/views/inwebo/casInweboSelectAuthnView.html
deleted file mode 100644
index 4ac0106d..00000000
--- a/cas/src/main/resources/views/inwebo/casInweboSelectAuthnView.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
- Select authentication
-
-
-
Select your authentication method:
-
-
-
-
-
diff --git a/cas/src/main/resources/views/inwebo/casInweboVAAuthnView.html b/cas/src/main/resources/views/inwebo/casInweboVAAuthnView.html
deleted file mode 100644
index ff666d45..00000000
--- a/cas/src/main/resources/views/inwebo/casInweboVAAuthnView.html
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
- Browser authentication
-
-
-
-
-
[[${login}]]
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/layout.html b/cas/src/main/resources/views/layout.html
deleted file mode 100644
index 225bce24..00000000
--- a/cas/src/main/resources/views/layout.html
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Theme stylesheet fragment will go here
-
-
-
-
-
-
-
Header fragment will go here
-
-
-
-
-
- CAS content will go here
-
-
-
-
Footer fragment will go here
-
CAS Account Disabled View
-
-
-
This account has been disabled.
-
- Please unlock the account.
-
-
-
- Please contact the system administrator to regain access.
-
-
-
-
-
diff --git a/cas/src/main/resources/views/login-error/casAccountLockedView.html b/cas/src/main/resources/views/login-error/casAccountLockedView.html
deleted file mode 100644
index f70955ee..00000000
--- a/cas/src/main/resources/views/login-error/casAccountLockedView.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- Account Locked View
-
-
-
This account has been locked.
-
- Please unlock the account.
-
-
-
- Please contact the system administrator to regain access.
-
-
-
-
diff --git a/cas/src/main/resources/views/login-error/casAccountUnlockedView.html b/cas/src/main/resources/views/login-error/casAccountUnlockedView.html
deleted file mode 100644
index 1c6f3885..00000000
--- a/cas/src/main/resources/views/login-error/casAccountUnlockedView.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- Account Unlocked View
-
-
-
Your account is unlocked.
-
Message Text
-
-
-
-
diff --git a/cas/src/main/resources/views/login-error/casAuthenticationBlockedView.html b/cas/src/main/resources/views/login-error/casAuthenticationBlockedView.html
deleted file mode 100644
index 3f3921b9..00000000
--- a/cas/src/main/resources/views/login-error/casAuthenticationBlockedView.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
- Authentication Blocked View
-
-
-
Authentication attempt is blocked.
-
Your authentication attempt is untrusted and unauthorized from
- your current workstation.
-
-
-
diff --git a/cas/src/main/resources/views/login-error/casBadHoursView.html b/cas/src/main/resources/views/login-error/casBadHoursView.html
deleted file mode 100644
index 522af55a..00000000
--- a/cas/src/main/resources/views/login-error/casBadHoursView.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- Bad Hours View
-
-
-
Your account is forbidden to login at this time.
-
Please try again later.
-
-
-
diff --git a/cas/src/main/resources/views/login-error/casBadWorkstationView.html b/cas/src/main/resources/views/login-error/casBadWorkstationView.html
deleted file mode 100644
index 06491930..00000000
--- a/cas/src/main/resources/views/login-error/casBadWorkstationView.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- Bad Workstation View
-
-
-
You cannot login from this workstation.
-
Please contact the system administrator to regain access.
-
-
-
diff --git a/cas/src/main/resources/views/login-error/casExpiredPassView.html b/cas/src/main/resources/views/login-error/casExpiredPassView.html
deleted file mode 100644
index 0f4f8deb..00000000
--- a/cas/src/main/resources/views/login-error/casExpiredPassView.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- CAS Expired Password View
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/cas/src/main/resources/views/login-error/casMustChangePassView.html b/cas/src/main/resources/views/login-error/casMustChangePassView.html
deleted file mode 100644
index dc954887..00000000
--- a/cas/src/main/resources/views/login-error/casMustChangePassView.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- You must change your password View
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/cas/src/main/resources/views/login/casConfirmView.html b/cas/src/main/resources/views/login/casConfirmView.html
deleted file mode 100644
index 03b2a288..00000000
--- a/cas/src/main/resources/views/login/casConfirmView.html
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
- Confirm View
-
-
-
You asked to be warned before logging into applications. Please
- proceed.
-
-
-
-
-
-
\ No newline at end of file
diff --git a/cas/src/main/resources/views/login/casGenericSuccessView.html b/cas/src/main/resources/views/login/casGenericSuccessView.html
deleted file mode 100644
index af6f34ae..00000000
--- a/cas/src/main/resources/views/login/casGenericSuccessView.html
+++ /dev/null
@@ -1,207 +0,0 @@
-
-
-
- Generic Success View
-
-
-
-
-
- Log In Successful
-
-
-
You, username , have successfully logged into the Central Authentication
- Service.
- However, you are seeing this page because CAS does not know about your target destination and how
- to get you there. Examine the authentication request again and make sure a target service/application that is authorized and registered with CAS is specified.
-
-
- When you are finished, for security reasons, please log out and exit your web browser.
-
-
-
-
- The following attributes and services are resolved and available for
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/login/casLoginMessageView.html b/cas/src/main/resources/views/login/casLoginMessageView.html
deleted file mode 100644
index cd679493..00000000
--- a/cas/src/main/resources/views/login/casLoginMessageView.html
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- CAS Login Message View
-
-
-
Authentication Succeeded with Warnings
-
-
- Lorem ipsum dolor sit amet, consectetur
- adipiscing elit.
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/login/casLoginView.html b/cas/src/main/resources/views/login/casLoginView.html
deleted file mode 100644
index 5bea30c1..00000000
--- a/cas/src/main/resources/views/login/casLoginView.html
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
-
- CAS | Login
-
-
-
认证登录系统
-
-
-
Copyright © 2023 中创金融纠纷调解中心
-
Confirm Logout View
-
-
-
Do you want to log out completely?
-
Do you want to log out completely?
-
An application may have redirected you to the Central
- Authentication Service to completely log you out and destroy your single sign-on session. \
- If you choose to log out, you will be asked again to provide your credentials and \
- login again once you attempt to access an application.
-
-
-
- The following applications are tied to your single sign-on session:
-
-
-
-
Do you want to proceed?
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/logout/casLogoutView.html b/cas/src/main/resources/views/logout/casLogoutView.html
deleted file mode 100644
index 167105ca..00000000
--- a/cas/src/main/resources/views/logout/casLogoutView.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
- CAS Logout
-
-
-
-
-
- Log Out Successful
-
-
-
You have successfully logged out of the Central Authentication
- Service. You may log in again.
-
For security reasons, exit your web browser.
-
-
-
-
-
diff --git a/cas/src/main/resources/views/logout/casPropagateLogoutView.html b/cas/src/main/resources/views/logout/casPropagateLogoutView.html
deleted file mode 100644
index f44e003a..00000000
--- a/cas/src/main/resources/views/logout/casPropagateLogoutView.html
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
- Propagate Logout View
-
-
-
-
Logout successful
-
You have successfully logged out of the Central Authentication
- Service. Given single logout is enabled with CAS, \
- the following list of applications are only notified to log you out and destroy your
- user session. Remember that this \
- is just a notification, not a guarantee. It is up the application itself to honor these notifications
- and properly take action to log you \
- out.
-
-
-
-
-
-
- Service id
-
-
-
-
-
For security reasons, exit your web browser.
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/mfa-trusted-devices/casMfaRegisterDeviceView.html b/cas/src/main/resources/views/mfa-trusted-devices/casMfaRegisterDeviceView.html
deleted file mode 100644
index 930165a5..00000000
--- a/cas/src/main/resources/views/mfa-trusted-devices/casMfaRegisterDeviceView.html
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
- CAS MFA Register Device View
-
-
-
Register Device
-
Please name the current device.
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/mfa/casCompositeMfaProviderSelectionView.html b/cas/src/main/resources/views/mfa/casCompositeMfaProviderSelectionView.html
deleted file mode 100644
index d8e1ec03..00000000
--- a/cas/src/main/resources/views/mfa/casCompositeMfaProviderSelectionView.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
- Composite MFA Provider Selection
-
-
-
Multifactor Authentication Provider Selection
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/mfa/casMfaDeniedView.html b/cas/src/main/resources/views/mfa/casMfaDeniedView.html
deleted file mode 100644
index 509705c6..00000000
--- a/cas/src/main/resources/views/mfa/casMfaDeniedView.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- MFA Denied View
-
-
-
MFA attempt is denied.
-
Your MFA provider has denied your attempt at second factor
- authentication. Contact your system administrator for help in restoring your account.
-
-
-
-
diff --git a/cas/src/main/resources/views/mfa/casMfaUnavailableView.html b/cas/src/main/resources/views/mfa/casMfaUnavailableView.html
deleted file mode 100644
index d8c9a50c..00000000
--- a/cas/src/main/resources/views/mfa/casMfaUnavailableView.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
- MFA Provider Unavailable
-
-
-
MFA Provider Unavailable
-
Your MFA provider is currently unavailable.
-
-
-
-
diff --git a/cas/src/main/resources/views/password-reset/casPasswordUpdateSuccessView.html b/cas/src/main/resources/views/password-reset/casPasswordUpdateSuccessView.html
deleted file mode 100644
index 49695481..00000000
--- a/cas/src/main/resources/views/password-reset/casPasswordUpdateSuccessView.html
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- Password Update Success View
-
-
-
Password Change Successful
-
Your account password is successfully updated.
-
-
-
-
-
-
\ No newline at end of file
diff --git a/cas/src/main/resources/views/password-reset/casResetPasswordErrorView.html b/cas/src/main/resources/views/password-reset/casResetPasswordErrorView.html
deleted file mode 100644
index e1f54622..00000000
--- a/cas/src/main/resources/views/password-reset/casResetPasswordErrorView.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- Password Reset Error View
-
-
-
Password Reset Failed
-
We were unable to process your password reset request at this time.
-
-
-
-
-
diff --git a/cas/src/main/resources/views/password-reset/casResetPasswordSendInstructionsView.html b/cas/src/main/resources/views/password-reset/casResetPasswordSendInstructionsView.html
deleted file mode 100644
index 3443b6ce..00000000
--- a/cas/src/main/resources/views/password-reset/casResetPasswordSendInstructionsView.html
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
- Reset Password Send Instructions View
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/password-reset/casResetPasswordSentInstructionsView.html b/cas/src/main/resources/views/password-reset/casResetPasswordSentInstructionsView.html
deleted file mode 100644
index 2588bddc..00000000
--- a/cas/src/main/resources/views/password-reset/casResetPasswordSentInstructionsView.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- Reset Password Sent Instructions View
-
-
-
Password Reset Instructions Sent Successfully.
-
You should shortly receive an email with
- follow-instructions to reset your password. Please do not take long as the password reset instructions
- may expire.
-
-
-
-
diff --git a/cas/src/main/resources/views/password-reset/casResetPasswordVerifyQuestionsView.html b/cas/src/main/resources/views/password-reset/casResetPasswordVerifyQuestionsView.html
deleted file mode 100644
index 1eecc54a..00000000
--- a/cas/src/main/resources/views/password-reset/casResetPasswordVerifyQuestionsView.html
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
- Reset Password Verify Questions View
-
-
-
-
Answer Security Questions
-
Welcome {0} . Before you can reset
- your password, you must answer the following security questions.
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/passwordless/casPasswordlessDisplayView.html b/cas/src/main/resources/views/passwordless/casPasswordlessDisplayView.html
deleted file mode 100644
index c27bbd22..00000000
--- a/cas/src/main/resources/views/passwordless/casPasswordlessDisplayView.html
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
- Passwordless Display View
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/passwordless/casPasswordlessGetUserIdView.html b/cas/src/main/resources/views/passwordless/casPasswordlessGetUserIdView.html
deleted file mode 100644
index 00980444..00000000
--- a/cas/src/main/resources/views/passwordless/casPasswordlessGetUserIdView.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
- Passwordless Get User Id View
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/protocol/2.0/casProxyFailureView.html b/cas/src/main/resources/views/protocol/2.0/casProxyFailureView.html
deleted file mode 100644
index efacf05e..00000000
--- a/cas/src/main/resources/views/protocol/2.0/casProxyFailureView.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
- [[${description}]]
-
diff --git a/cas/src/main/resources/views/protocol/2.0/casProxySuccessView.html b/cas/src/main/resources/views/protocol/2.0/casProxySuccessView.html
deleted file mode 100644
index 3a7bf240..00000000
--- a/cas/src/main/resources/views/protocol/2.0/casProxySuccessView.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- [[${ticket}]]
-
-
diff --git a/cas/src/main/resources/views/protocol/2.0/casServiceValidationFailure.html b/cas/src/main/resources/views/protocol/2.0/casServiceValidationFailure.html
deleted file mode 100644
index b552c17a..00000000
--- a/cas/src/main/resources/views/protocol/2.0/casServiceValidationFailure.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
- [[${description}]]
-
diff --git a/cas/src/main/resources/views/protocol/2.0/casServiceValidationSuccess.html b/cas/src/main/resources/views/protocol/2.0/casServiceValidationSuccess.html
deleted file mode 100644
index cd387267..00000000
--- a/cas/src/main/resources/views/protocol/2.0/casServiceValidationSuccess.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- [[${principal.id}]]
- [[${pgtIou}]]
-
- [[${proxy.principal.id}]]
-
-
-
diff --git a/cas/src/main/resources/views/protocol/3.0/casServiceValidationFailure.html b/cas/src/main/resources/views/protocol/3.0/casServiceValidationFailure.html
deleted file mode 100644
index b552c17a..00000000
--- a/cas/src/main/resources/views/protocol/3.0/casServiceValidationFailure.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
- [[${description}]]
-
diff --git a/cas/src/main/resources/views/protocol/3.0/casServiceValidationSuccess.html b/cas/src/main/resources/views/protocol/3.0/casServiceValidationSuccess.html
deleted file mode 100644
index 88164731..00000000
--- a/cas/src/main/resources/views/protocol/3.0/casServiceValidationSuccess.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/protocol/casPostResponseView.html b/cas/src/main/resources/views/protocol/casPostResponseView.html
deleted file mode 100644
index 8f3810c5..00000000
--- a/cas/src/main/resources/views/protocol/casPostResponseView.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/protocol/oauth/confirm.html b/cas/src/main/resources/views/protocol/oauth/confirm.html
deleted file mode 100644
index fb8a648f..00000000
--- a/cas/src/main/resources/views/protocol/oauth/confirm.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
Unable to Proceed
-
- rootCauseException.code
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/protocol/openid/casOpenIdAssociationSuccessView.html b/cas/src/main/resources/views/protocol/openid/casOpenIdAssociationSuccessView.html
deleted file mode 100644
index 84fff3a5..00000000
--- a/cas/src/main/resources/views/protocol/openid/casOpenIdAssociationSuccessView.html
+++ /dev/null
@@ -1,7 +0,0 @@
-ns:[(${ns})]
-enc_mac_key:[(${enc_mac_key})]
-assoc_type:[(${assoc_type})]
-dh_server_public:[(${dh_server_public})]
-session_type:[(${session_type})]
-expires_in:[(${expires_in})]
-assoc_handle:[(${assoc_handle})]
diff --git a/cas/src/main/resources/views/protocol/openid/casOpenIdServiceFailureView.html b/cas/src/main/resources/views/protocol/openid/casOpenIdServiceFailureView.html
deleted file mode 100644
index 31cee8c3..00000000
--- a/cas/src/main/resources/views/protocol/openid/casOpenIdServiceFailureView.html
+++ /dev/null
@@ -1,2 +0,0 @@
-ns:[(${ns})]
-is_valid:[(${is_valid})]
diff --git a/cas/src/main/resources/views/protocol/openid/casOpenIdServiceSuccessView.html b/cas/src/main/resources/views/protocol/openid/casOpenIdServiceSuccessView.html
deleted file mode 100644
index 31cee8c3..00000000
--- a/cas/src/main/resources/views/protocol/openid/casOpenIdServiceSuccessView.html
+++ /dev/null
@@ -1,2 +0,0 @@
-ns:[(${ns})]
-is_valid:[(${is_valid})]
diff --git a/cas/src/main/resources/views/protocol/openid/user.html b/cas/src/main/resources/views/protocol/openid/user.html
deleted file mode 100644
index 7b458823..00000000
--- a/cas/src/main/resources/views/protocol/openid/user.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/radius/casRadiusLoginView.html b/cas/src/main/resources/views/radius/casRadiusLoginView.html
deleted file mode 100644
index 69252432..00000000
--- a/cas/src/main/resources/views/radius/casRadiusLoginView.html
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
Radius Login View
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/saml2-discovery/casSamlIdPDiscoveryView.html b/cas/src/main/resources/views/saml2-discovery/casSamlIdPDiscoveryView.html
deleted file mode 100644
index ed144450..00000000
--- a/cas/src/main/resources/views/saml2-discovery/casSamlIdPDiscoveryView.html
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-
SAML2 Identity Provider Discovery
-
-
-
-
-
-
-
-
SAML Identity Provider Discovery
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/saml2-idp/casSamlIdPErrorView.html b/cas/src/main/resources/views/saml2-idp/casSamlIdPErrorView.html
deleted file mode 100644
index 75528f6d..00000000
--- a/cas/src/main/resources/views/saml2-idp/casSamlIdPErrorView.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
SAML2 Authentication Error
-
-
-
-
-
-
-
SAML2 Identity Provider Error
-
- The service you are attempting to log into, has identified a problem
- with your profile or request. Please contact your IT helpdesk for support.
-
-
-
-
diff --git a/cas/src/main/resources/views/simple-mfa/casSimpleMfaLoginView.html b/cas/src/main/resources/views/simple-mfa/casSimpleMfaLoginView.html
deleted file mode 100644
index f5ae3c80..00000000
--- a/cas/src/main/resources/views/simple-mfa/casSimpleMfaLoginView.html
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
-
-
-
-
CAS Multifactor Authentication View
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/storage/casSessionStorageReadView.html b/cas/src/main/resources/views/storage/casSessionStorageReadView.html
deleted file mode 100644
index 62fddba8..00000000
--- a/cas/src/main/resources/views/storage/casSessionStorageReadView.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/storage/casSessionStorageWriteView.html b/cas/src/main/resources/views/storage/casSessionStorageWriteView.html
deleted file mode 100644
index 7efd95d2..00000000
--- a/cas/src/main/resources/views/storage/casSessionStorageWriteView.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
Processing request. This might take a few seconds...
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/surrogate/casSurrogateAuthnListView.html b/cas/src/main/resources/views/surrogate/casSurrogateAuthnListView.html
deleted file mode 100644
index f45ffb60..00000000
--- a/cas/src/main/resources/views/surrogate/casSurrogateAuthnListView.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
Surrogate Account Selection View
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/surrogate/casSurrogateAuthnWildcardView.html b/cas/src/main/resources/views/surrogate/casSurrogateAuthnWildcardView.html
deleted file mode 100644
index c1194f2b..00000000
--- a/cas/src/main/resources/views/surrogate/casSurrogateAuthnWildcardView.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
- Surrogate Account Selection View
-
-
-
-
Wildcard Account
-
-
Your account is marked as wildcard.
-
-
-
Swivel Login View
-
-
-
Swivel Authentication
-
-
-
-
diff --git a/cas/src/main/resources/views/u2f/casU2fLoginView.html b/cas/src/main/resources/views/u2f/casU2fLoginView.html
deleted file mode 100644
index 3d7cbd18..00000000
--- a/cas/src/main/resources/views/u2f/casU2fLoginView.html
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
- U2f Login View
-
-
-
Authenticate Device
-
-
Please touch the flashing U2F device now.
-
You may be prompted to allow the site permission to access your security keys. After granting
- permission, the device will start to blink.
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/cas/src/main/resources/views/u2f/casU2fRegistrationView.html b/cas/src/main/resources/views/u2f/casU2fRegistrationView.html
deleted file mode 100644
index a826321e..00000000
--- a/cas/src/main/resources/views/u2f/casU2fRegistrationView.html
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
- U2f Registration View
-
-
-
Register Device
-
-
Please touch the flashing U2F device now.
-
You may be prompted to allow the site permission to access your security keys. After granting
- permission, the device will start to blink.
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/webauthn/casWebAuthnLoginView.html b/cas/src/main/resources/views/webauthn/casWebAuthnLoginView.html
deleted file mode 100644
index 65fa8037..00000000
--- a/cas/src/main/resources/views/webauthn/casWebAuthnLoginView.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- Web AuthN Login View
-
-
-
-
-
diff --git a/cas/src/main/resources/views/webauthn/casWebAuthnRegistrationView.html b/cas/src/main/resources/views/webauthn/casWebAuthnRegistrationView.html
deleted file mode 100644
index a5d3a20e..00000000
--- a/cas/src/main/resources/views/webauthn/casWebAuthnRegistrationView.html
+++ /dev/null
@@ -1,177 +0,0 @@
-
-
-
-
- Web AuthN Registration View
-
-
-
-
-
-
- Server Response
-
-
- Authenticator Response
-
-
- Request
-
-
-
-
-
-
Authenticator Response:
-
-
-
-
-
-
-
-
Register Device
-
-
Assign a friendly-name to your FIDO2-enabled device and then register it with CAS for multifactor
- authentication. Once device registration is successfully completed, you will automatically
- be redirected to the next step to login with your device.
-
-
-
-
-
-
-
-
-
-
Your FIDO2-enabled device is now registered with CAS. Please wait...
-
-
-
-
- Register Device
-
-
-
-
-
-
- Register Device with Discoverable Credentials
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cas/src/main/resources/views/wsfed/casWsFedStopWebflow.html b/cas/src/main/resources/views/wsfed/casWsFedStopWebflow.html
deleted file mode 100644
index b70833ad..00000000
--- a/cas/src/main/resources/views/wsfed/casWsFedStopWebflow.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
- Wsfederation Webflow Stopped
-
-
- Either the authentication request was rejected/cancelled, or
- the authentication provider denied access due to permissions, etc. Review logs to find the root cause of
- the issue.
-
-
-
-
diff --git a/cas/src/main/resources/views/yubikey/casYubiKeyLoginView.html b/cas/src/main/resources/views/yubikey/casYubiKeyLoginView.html
deleted file mode 100644
index a3b8b983..00000000
--- a/cas/src/main/resources/views/yubikey/casYubiKeyLoginView.html
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
- YubiKey Login View
-
-
-
-
-
diff --git a/cas/src/main/resources/views/yubikey/casYubiKeyRegistrationView.html b/cas/src/main/resources/views/yubikey/casYubiKeyRegistrationView.html
deleted file mode 100644
index 637c4ec6..00000000
--- a/cas/src/main/resources/views/yubikey/casYubiKeyRegistrationView.html
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-
- YubiKey Registration View
-
-
-
-
-
-
diff --git a/cas/src/test/java/com/pudonghot/cas/DemoApplicationTests.java b/cas/src/test/java/com/pudonghot/cas/DemoApplicationTests.java
deleted file mode 100644
index d538c865..00000000
--- a/cas/src/test/java/com/pudonghot/cas/DemoApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.pudonghot.cas;
-
-import org.junit.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class DemoApplicationTests {
- private static final long serialVersionUID = 1L;
-
- @Test
- void contextLoads() {
- }
-}
diff --git a/cas/start.sh b/cas/start.sh
deleted file mode 100755
index a845645d..00000000
--- a/cas/start.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# get real path of softlink
-get_real_path() {
- local f="$1"
- while [ -h "$f" ]; do
- ls=`ls -ld "$f"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- f="$link"
- else
- f=`dirname "$f"`/"$link"
- fi
- done
- echo "$f"
-}
-
-prg_path=$(get_real_path "$0")
-echo "Script path [$prg_path]"
-
-# Service Home
-pushd $(dirname "$prg_path") > /dev/null
-WORK_DIR=$(pwd)
-echo "Work dir [$WORK_DIR]"
-
-profile=local
-
-if [ "$1" != 'nb' ]; then
- mvn -T 4C clean package -am -DskipTests
-fi
-
-java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000 \
- -Dwork.dir=$WORK_DIR \
- -jar target/cas.war \
- --work.dir=$WORK_DIR \
- --logging.config=src/main/resources/log4j2.xml \
- --spring.config.location=file:src/main/resources/application.yml
-
-popd > /dev/null
diff --git a/cms/pom.xml b/cms/pom.xml
index db565a53..edd7c9ec 100644
--- a/cms/pom.xml
+++ b/cms/pom.xml
@@ -48,7 +48,7 @@
yo-http-client-apache
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-security-cas
@@ -56,7 +56,7 @@
yo-shiro-cache
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-common
@@ -121,7 +121,7 @@
java.base/java.lang=ALL-UNNAMED
--add-opens
java.base/java.lang.reflect=ALL-UNNAMED
- me.chyxion.tigon.web.controller.TigonControllerGenerator
+ com.pudonghot.tigon.web.controller.TigonControllerGenerator
--project-dir=${project.basedir}
--scan-package=com.pudonghot.yo.cms
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/common/AuthHookImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/common/AuthHookImpl.java
index 96635332..40f7b208 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/common/AuthHookImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/common/AuthHookImpl.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.cms.common;
-import me.chyxion.tigon.dal.hook.AuthHook;
+import com.pudonghot.tigon.dal.hook.AuthHook;
import com.pudonghot.yo.webauth.SessionAbility;
import org.springframework.stereotype.Component;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/ControllerAdvice.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/ControllerAdvice.java
index f2daa488..a5b6c366 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/ControllerAdvice.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/ControllerAdvice.java
@@ -2,12 +2,12 @@ package com.pudonghot.yo.cms.controller;
import lombok.val;
import lombok.extern.slf4j.Slf4j;
-import me.chyxion.tigon.web.JsonView;
+import com.pudonghot.tigon.web.JsonView;
import lombok.RequiredArgsConstructor;
-import me.chyxion.tigon.web.JsonViewModel;
-import me.chyxion.tigon.web.JsonViewConfig;
+import com.pudonghot.tigon.web.JsonViewModel;
+import com.pudonghot.tigon.web.JsonViewConfig;
import org.apache.commons.lang3.StringUtils;
-import me.chyxion.tigon.web.util.ExceptionUtils;
+import com.pudonghot.tigon.web.util.ExceptionUtils;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Controller;
import org.springframework.core.annotation.Order;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/ErrorController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/ErrorController.java
index 7cb04bce..4c1fe1dc 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/ErrorController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/ErrorController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.cms.controller;
import lombok.val;
-import javax.servlet.RequestDispatcher;
+import jakarta.servlet.RequestDispatcher;
import org.springframework.http.HttpStatus;
-import me.chyxion.tigon.web.JsonViewModel;
-import javax.servlet.http.HttpServletRequest;
+import com.pudonghot.tigon.web.JsonViewModel;
+import jakarta.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/AgentController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/AgentController.java
index 4b187b33..be9980fb 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/AgentController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/AgentController.java
@@ -1,15 +1,15 @@
package com.pudonghot.yo.cms.controller.agent;
-import javax.validation.Valid;
-import me.chyxion.tigon.kit.bean.BeanService;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import jakarta.validation.Valid;
+import com.pudonghot.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.cms.service.agent.AgentService;
import com.pudonghot.yo.cms.controller.agent.model.AgentVO;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.agent.request.AgentCreateReqVO;
import com.pudonghot.yo.cms.controller.agent.request.AgentUpdateReqVO;
import com.pudonghot.yo.cms.service.agent.request.AgentBatchCreateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/AgentGroupController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/AgentGroupController.java
index f6db8a3f..3b67d653 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/AgentGroupController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/AgentGroupController.java
@@ -1,11 +1,11 @@
package com.pudonghot.yo.cms.controller.agent;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.cms.service.agent.AgentGroupService;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.cms.controller.agent.model.AgentGroupVO;
import com.pudonghot.yo.basic.model.enumeration.PrivacyLevelEnum;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.agent.request.AgentGroupUpdateReqVO;
import com.pudonghot.yo.cms.controller.agent.request.AgentGroupCreateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/AgentStatusController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/AgentStatusController.java
index c05cca60..d9a52ffc 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/AgentStatusController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/AgentStatusController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.cms.controller.agent;
import com.pudonghot.yo.service.AgentStatusService;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.cms.controller.agent.model.AgentStatusVO;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.agent.request.AgentStatusListReqVO;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentBatchCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentBatchCreateReqVO.java
index a24e5e75..3d05d625 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentBatchCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentBatchCreateReqVO.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.cms.controller.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import org.hibernate.validator.constraints.Range;
import com.pudonghot.yo.cms.request.TaggableReqVO;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentCreateReqVO.java
index d133fa0f..8bc68a54 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentCreateReqVO.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.cms.controller.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import org.hibernate.validator.constraints.Range;
import com.pudonghot.yo.cms.request.TaggableReqVO;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentGroupCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentGroupCreateReqVO.java
index 718625be..7680e8b4 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentGroupCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentGroupCreateReqVO.java
@@ -3,11 +3,11 @@ package com.pudonghot.yo.cms.controller.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
import com.pudonghot.yo.cms.request.TaggableReqVO;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
import com.pudonghot.yo.basic.model.enumeration.PrivacyLevelEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentGroupUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentGroupUpdateReqVO.java
index c5d1c1a6..54ce850f 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentGroupUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentGroupUpdateReqVO.java
@@ -4,10 +4,10 @@ import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import com.pudonghot.yo.cms.request.TaggableReqVO;
import com.pudonghot.yo.basic.model.enumeration.PrivacyLevelEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentStatusListReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentStatusListReqVO.java
index 28e0b349..723d1d5e 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentStatusListReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentStatusListReqVO.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.controller.agent.request;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import me.chyxion.tigon.annotation.Trim;
-import me.chyxion.tigon.web.controller.request.ListCtrlrReq;
+import com.pudonghot.tigon.annotation.Trim;
+import com.pudonghot.tigon.web.controller.request.ListCtrlrReq;
import com.pudonghot.yo.basic.model.enumeration.AgentStatusStateEnum;
import com.pudonghot.yo.basic.model.enumeration.AgentStatusStatusEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentUpdateReqVO.java
index eab02e0c..4436e4a6 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/agent/request/AgentUpdateReqVO.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.cms.controller.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import org.hibernate.validator.constraints.Range;
import com.pudonghot.yo.cms.request.TaggableReqVO;
import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/AuthController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/AuthController.java
index 599ad62c..7b9ef476 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/AuthController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/AuthController.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.cms.controller.auth;
import lombok.val;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import com.pudonghot.yo.webauth.SessionAbility;
import org.springframework.stereotype.Controller;
import com.pudonghot.yo.webauth.service.AuthService;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/AuthPermissionController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/AuthPermissionController.java
index c2afe0fe..1384ff85 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/AuthPermissionController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/AuthPermissionController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.cms.controller.auth;
import com.pudonghot.yo.webauth.SessionAbility;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.cms.service.auth.AuthPermissionService;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.auth.model.AuthPermissionVO;
import com.pudonghot.yo.cms.controller.auth.request.AuthPermissionUpdateReqVO;
import com.pudonghot.yo.cms.controller.auth.request.AuthPermissionCreateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/AuthRoleController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/AuthRoleController.java
index ae6ec121..ac66259e 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/AuthRoleController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/AuthRoleController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.cms.controller.auth;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.cms.service.auth.AuthRoleService;
import com.pudonghot.yo.cms.controller.auth.model.AuthRoleVO;
import org.springframework.web.bind.annotation.RequestMapping;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.auth.request.AuthRoleCreateReqVO;
import com.pudonghot.yo.cms.controller.auth.request.AuthRoleUpdateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/AuthUserController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/AuthUserController.java
index 7c11ab80..9e0b9688 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/AuthUserController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/AuthUserController.java
@@ -1,15 +1,15 @@
package com.pudonghot.yo.cms.controller.auth;
-import javax.validation.Valid;
-import me.chyxion.tigon.kit.bean.BeanService;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import jakarta.validation.Valid;
+import com.pudonghot.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.cms.service.auth.AuthUserService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import com.pudonghot.yo.cms.controller.auth.model.AuthUserVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.auth.request.AuthUserUpdateReqVO;
import com.pudonghot.yo.cms.controller.auth.request.AuthUserCreateReqVO;
import com.pudonghot.yo.cms.service.auth.request.AuthUserBatchCreateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/interceptor/ManagerInterceptor.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/interceptor/ManagerInterceptor.java
index 19013fdb..358ff894 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/interceptor/ManagerInterceptor.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/interceptor/ManagerInterceptor.java
@@ -3,14 +3,14 @@ package com.pudonghot.yo.cms.controller.auth.interceptor;
import lombok.val;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
-import me.chyxion.tigon.web.JsonView;
+import com.pudonghot.tigon.web.JsonView;
import java.nio.charset.StandardCharsets;
-import me.chyxion.tigon.web.JsonViewModel;
-import me.chyxion.tigon.web.JsonViewConfig;
+import com.pudonghot.tigon.web.JsonViewModel;
+import com.pudonghot.tigon.web.JsonViewConfig;
import io.buji.pac4j.subject.Pac4jPrincipal;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import me.chyxion.tigon.kit.bean.BeanService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.springframework.util.MimeTypeUtils;
import org.springframework.stereotype.Component;
import org.springframework.beans.factory.InitializingBean;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthPermissionCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthPermissionCreateReqVO.java
index 4aafb43e..0cf07ca5 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthPermissionCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthPermissionCreateReqVO.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.cms.controller.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.request.TaggableReqVO;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthRoleCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthRoleCreateReqVO.java
index 5c6a20a8..0bed8385 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthRoleCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthRoleCreateReqVO.java
@@ -2,9 +2,9 @@ package com.pudonghot.yo.cms.controller.auth.request;
import lombok.Getter;
import lombok.Setter;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.request.TaggableReqVO;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthUserBatchCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthUserBatchCreateReqVO.java
index 96df65ef..ec374152 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthUserBatchCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthUserBatchCreateReqVO.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.controller.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.request.TaggableReqVO;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthUserCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthUserCreateReqVO.java
index 84c26f28..39504d5f 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthUserCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthUserCreateReqVO.java
@@ -2,9 +2,9 @@ package com.pudonghot.yo.cms.controller.auth.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
import com.pudonghot.yo.cms.request.TaggableReqVO;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
import org.hibernate.validator.constraints.Length;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthUserUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthUserUpdateReqVO.java
index c103349a..1450dd07 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthUserUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/auth/request/AuthUserUpdateReqVO.java
@@ -4,8 +4,8 @@ import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
import com.pudonghot.yo.cms.request.TaggableReqVO;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
import java.util.List;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/CallingListController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/CallingListController.java
index 37c1f239..8c62c827 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/CallingListController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/CallingListController.java
@@ -5,17 +5,17 @@ import java.util.Map;
import java.util.List;
import java.util.HashMap;
import java.util.ArrayList;
-import javax.validation.Valid;
-import me.chyxion.tigon.kit.bean.BeanService;
+import jakarta.validation.Valid;
+import com.pudonghot.tigon.kit.bean.BeanService;
import com.pudonghot.yo.webauth.SessionAbility;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.dal.callinglist.model.CallingList;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import com.pudonghot.yo.cms.controller.callinglist.request.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.service.callinglist.CallingListService;
import com.pudonghot.yo.cms.service.callinglist.request.RedialServReq;
import com.pudonghot.yo.cms.service.callinglist.request.RevertServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/CallingListCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/CallingListCreateReqVO.java
index 7c2927ff..9ae1d6ef 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/CallingListCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/CallingListCreateReqVO.java
@@ -2,12 +2,12 @@ package com.pudonghot.yo.cms.controller.callinglist.request;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
import com.pudonghot.yo.dal.callinglist.model.CallingList;
-import me.chyxion.tigon.annotation.Trim;
+import com.pudonghot.tigon.annotation.Trim;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
/**
* @author bingpo
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/CallingListUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/CallingListUpdateReqVO.java
index b32324b5..d512a88f 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/CallingListUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/CallingListUpdateReqVO.java
@@ -2,12 +2,12 @@ package com.pudonghot.yo.cms.controller.callinglist.request;
import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
import com.pudonghot.yo.dal.callinglist.model.CallingList;
-import me.chyxion.tigon.annotation.Trim;
+import com.pudonghot.tigon.annotation.Trim;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import java.util.Date;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/ImportHistoricalCtrlrReq.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/ImportHistoricalCtrlrReq.java
index 6b15b762..14f35197 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/ImportHistoricalCtrlrReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/ImportHistoricalCtrlrReq.java
@@ -6,11 +6,11 @@ import lombok.ToString;
import java.io.Serializable;
import java.util.Date;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
import com.pudonghot.yo.basic.model.DailyTime;
-import me.chyxion.tigon.web.controller.annotation.Principal;
-import me.chyxion.tigon.web.controller.annotation.TenantId;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.web.controller.annotation.TenantId;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/ImportPreparedCtrlrReq.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/ImportPreparedCtrlrReq.java
index e7096059..1969a034 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/ImportPreparedCtrlrReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/ImportPreparedCtrlrReq.java
@@ -4,11 +4,11 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import com.pudonghot.yo.basic.model.DailyTime;
-import javax.validation.constraints.Min;
-import me.chyxion.tigon.web.controller.annotation.Principal;
-import me.chyxion.tigon.web.controller.annotation.TenantId;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.web.controller.annotation.TenantId;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import java.io.Serializable;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/RedialCtrlrReq.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/RedialCtrlrReq.java
index 2f8058a1..7b1ca6a3 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/RedialCtrlrReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/RedialCtrlrReq.java
@@ -4,12 +4,12 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import com.pudonghot.yo.basic.model.DailyTime;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.dal.callinglist.model.CallingList;
-import me.chyxion.tigon.web.controller.annotation.Principal;
-import me.chyxion.tigon.web.controller.annotation.TenantId;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.web.controller.annotation.TenantId;
import java.io.Serializable;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/RevertCtrlrReq.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/RevertCtrlrReq.java
index 2ea8af1a..f60b6db7 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/RevertCtrlrReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/callinglist/request/RevertCtrlrReq.java
@@ -4,12 +4,12 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.dal.callinglist.model.CallingList;
-import me.chyxion.tigon.web.controller.annotation.Principal;
-import me.chyxion.tigon.web.controller.annotation.TenantId;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.web.controller.annotation.TenantId;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/campaign/CampaignController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/campaign/CampaignController.java
index ec72dd65..252a4714 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/campaign/CampaignController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/campaign/CampaignController.java
@@ -1,16 +1,16 @@
package com.pudonghot.yo.cms.controller.campaign;
import lombok.val;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
import org.springframework.util.Assert;
-import me.chyxion.tigon.kit.bean.BeanService;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.web.bind.annotation.RequestBody;
import com.pudonghot.yo.cms.service.campaign.CampaignService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.cms.controller.campaign.model.CampaignVO;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.service.request.UpdateCampaignStatusServReq;
import com.pudonghot.yo.cms.controller.campaign.request.CampaignOpReqVO;
import com.pudonghot.yo.cms.controller.campaign.request.CampaignUpdateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/campaign/request/CampaignCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/campaign/request/CampaignCreateReqVO.java
index e195d7e6..a91f39c6 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/campaign/request/CampaignCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/campaign/request/CampaignCreateReqVO.java
@@ -2,11 +2,11 @@ package com.pudonghot.yo.cms.controller.campaign.request;
import lombok.Getter;
import lombok.Setter;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.basic.model.DailyTime;
import com.pudonghot.yo.cms.request.TaggableReqVO;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/campaign/request/CampaignUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/campaign/request/CampaignUpdateReqVO.java
index 763f9b0c..74a0637b 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/campaign/request/CampaignUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/campaign/request/CampaignUpdateReqVO.java
@@ -3,11 +3,11 @@ package com.pudonghot.yo.cms.controller.campaign.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.basic.model.DailyTime;
import com.pudonghot.yo.cms.request.TaggableReqVO;
import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/cdr/CallDetailRecordController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/cdr/CallDetailRecordController.java
index 796a0b6a..55fb616b 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/cdr/CallDetailRecordController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/cdr/CallDetailRecordController.java
@@ -1,15 +1,15 @@
package com.pudonghot.yo.cms.controller.cdr;
import java.util.List;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import com.pudonghot.yo.webauth.SessionAbility;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.validation.annotation.Validated;
-import me.chyxion.tigon.web.controller.response.ListCtrlrResp;
+import com.pudonghot.tigon.web.controller.response.ListCtrlrResp;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.cms.service.cdr.CallDetailRecordService;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.cdr.model.CallDetailRecordVO;
import com.pudonghot.yo.dal.callinglist.response.CallDetailReportDalResp;
import com.pudonghot.yo.cms.controller.cdr.request.CallDetailRecordListCtrlrReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/cdr/request/CallDetailRecordAccountReportCtrlrReq.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/cdr/request/CallDetailRecordAccountReportCtrlrReq.java
index 65dc1235..028feee7 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/cdr/request/CallDetailRecordAccountReportCtrlrReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/cdr/request/CallDetailRecordAccountReportCtrlrReq.java
@@ -5,10 +5,10 @@ import lombok.Setter;
import java.util.Date;
import lombok.ToString;
import java.io.Serializable;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import me.chyxion.tigon.web.controller.annotation.Principal;
-import me.chyxion.tigon.web.controller.annotation.TenantId;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.web.controller.annotation.TenantId;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/cdr/request/CallDetailRecordListCtrlrReq.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/cdr/request/CallDetailRecordListCtrlrReq.java
index 62df4f0f..b0c89927 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/cdr/request/CallDetailRecordListCtrlrReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/cdr/request/CallDetailRecordListCtrlrReq.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.controller.cdr.request;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
-import javax.validation.constraints.NotNull;
-import me.chyxion.tigon.web.controller.request.ListCtrlrReq;
+import jakarta.validation.constraints.NotNull;
+import com.pudonghot.tigon.web.controller.request.ListCtrlrReq;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/gateway/GatewayController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/gateway/GatewayController.java
index 77c16b94..0e085bfc 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/gateway/GatewayController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/gateway/GatewayController.java
@@ -1,13 +1,13 @@
package com.pudonghot.yo.cms.controller.gateway;
import com.pudonghot.yo.fsagent.api.FsEslService;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.web.bind.annotation.PostMapping;
import com.pudonghot.yo.cms.service.gateway.GatewayService;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.cms.controller.gateway.model.GatewayVO;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.gateway.request.GatewayCreateReqVO;
import com.pudonghot.yo.cms.controller.gateway.request.GatewayUpdateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/gateway/request/GatewayCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/gateway/request/GatewayCreateReqVO.java
index eb74689a..25b9504f 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/gateway/request/GatewayCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/gateway/request/GatewayCreateReqVO.java
@@ -1,11 +1,11 @@
package com.pudonghot.yo.cms.controller.gateway.request;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
-import me.chyxion.tigon.annotation.Trim;
+import com.pudonghot.tigon.annotation.Trim;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/gateway/request/GatewayUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/gateway/request/GatewayUpdateReqVO.java
index 35255da6..210ab59b 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/gateway/request/GatewayUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/gateway/request/GatewayUpdateReqVO.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.controller.gateway.request;
import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/IvrEntryController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/IvrEntryController.java
index 2ac37338..f70de8ec 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/IvrEntryController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/IvrEntryController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.cms.controller.ivr;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.cms.service.ivr.IvrEntryService;
import com.pudonghot.yo.cms.controller.ivr.model.IvrEntryVO;
import org.springframework.web.bind.annotation.RequestMapping;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.ivr.request.IvrEntryListReqVO;
import com.pudonghot.yo.cms.controller.ivr.request.IvrEntryCreateReqVO;
import com.pudonghot.yo.cms.controller.ivr.request.IvrEntryUpdateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/IvrMenuController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/IvrMenuController.java
index 4db563d0..a895df2d 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/IvrMenuController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/IvrMenuController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.cms.controller.ivr;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.cms.service.ivr.IvrMenuService;
import com.pudonghot.yo.cms.controller.ivr.model.IvrMenuVO;
import org.springframework.web.bind.annotation.RequestMapping;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.ivr.request.IvrMenuCreateReqVO;
import com.pudonghot.yo.cms.controller.ivr.request.IvrMenuUpdateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrEntryCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrEntryCreateReqVO.java
index 33530ea7..5493b940 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrEntryCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrEntryCreateReqVO.java
@@ -2,9 +2,9 @@ package com.pudonghot.yo.cms.controller.ivr.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrEntryListReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrEntryListReqVO.java
index eba0dfae..b643ea8a 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrEntryListReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrEntryListReqVO.java
@@ -2,8 +2,8 @@ package com.pudonghot.yo.cms.controller.ivr.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
-import me.chyxion.tigon.web.controller.request.ListCtrlrReq;
+import jakarta.validation.constraints.NotNull;
+import com.pudonghot.tigon.web.controller.request.ListCtrlrReq;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrEntryUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrEntryUpdateReqVO.java
index c202e1f0..35884f38 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrEntryUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrEntryUpdateReqVO.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.controller.ivr.request;
import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrMenuCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrMenuCreateReqVO.java
index fb053b71..dbc9e499 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrMenuCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrMenuCreateReqVO.java
@@ -2,11 +2,11 @@ package com.pudonghot.yo.cms.controller.ivr.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
-import me.chyxion.tigon.annotation.Trim;
+import com.pudonghot.tigon.annotation.Trim;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrMenuUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrMenuUpdateReqVO.java
index 76ceef8b..97304da1 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrMenuUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/ivr/request/IvrMenuUpdateReqVO.java
@@ -2,9 +2,9 @@ package com.pudonghot.yo.cms.controller.ivr.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/AreaCodeController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/AreaCodeController.java
index 11d0dd84..ead01159 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/AreaCodeController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/AreaCodeController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.cms.controller.misc;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.cms.service.misc.AreaCodeService;
import com.pudonghot.yo.cms.controller.misc.model.AreaCodeVO;
import org.springframework.web.bind.annotation.RequestMapping;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.misc.request.AreaCodeCreateReqVO;
import com.pudonghot.yo.cms.controller.misc.request.AreaCodeUpdateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/SequenceController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/SequenceController.java
index f24978d2..45c83dff 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/SequenceController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/SequenceController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.cms.controller.misc;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.cms.service.misc.SequenceService;
import com.pudonghot.yo.cms.controller.misc.model.SequenceVO;
import org.springframework.web.bind.annotation.RequestMapping;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.misc.request.SequenceUpdateReqVO;
import com.pudonghot.yo.cms.controller.misc.request.SequenceCreateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/SoundController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/SoundController.java
index 092c98e7..06456a7a 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/SoundController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/SoundController.java
@@ -5,11 +5,11 @@ import java.io.File;
import org.springframework.http.MediaType;
import org.apache.commons.io.FilenameUtils;
import org.springframework.core.io.Resource;
-import me.chyxion.tigon.kit.bean.BeanService;
-import javax.servlet.http.HttpServletRequest;
+import com.pudonghot.tigon.kit.bean.BeanService;
+import jakarta.servlet.http.HttpServletRequest;
import org.springframework.http.ResponseEntity;
import com.pudonghot.yo.cms.service.ivr.SoundService;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.core.io.FileSystemResource;
import com.pudonghot.yo.cms.controller.misc.model.SoundVO;
import org.springframework.beans.factory.annotation.Value;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.service.ivr.request.SoundUpdateServReq;
import com.pudonghot.yo.cms.service.ivr.request.SoundCreateServReq;
import com.pudonghot.yo.cms.controller.misc.request.SoundUpdateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/TelecomVendorController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/TelecomVendorController.java
index 7b1ced5c..839cf271 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/TelecomVendorController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/TelecomVendorController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.cms.controller.misc;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.cms.service.misc.TelecomVendorService;
import com.pudonghot.yo.cms.controller.misc.model.TelecomVendorVO;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.misc.request.TelecomVendorCreateReqVO;
import com.pudonghot.yo.cms.controller.misc.request.TelecomVendorUpdateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/AreaCodeCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/AreaCodeCreateReqVO.java
index a7f0bc5a..e305842a 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/AreaCodeCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/AreaCodeCreateReqVO.java
@@ -4,8 +4,8 @@ import com.pudonghot.yo.cms.request.BaseCreateReqVO;
import com.pudonghot.yo.cms.request.TaggableReqVO;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
import java.util.List;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/AreaCodeUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/AreaCodeUpdateReqVO.java
index 0425446a..65b197a4 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/AreaCodeUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/AreaCodeUpdateReqVO.java
@@ -4,8 +4,8 @@ import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
import com.pudonghot.yo.cms.request.TaggableReqVO;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
import java.util.List;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/SequenceCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/SequenceCreateReqVO.java
index e86f2dbb..dbb2a151 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/SequenceCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/SequenceCreateReqVO.java
@@ -2,8 +2,8 @@ package com.pudonghot.yo.cms.controller.misc.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.*;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.*;
+import com.pudonghot.tigon.annotation.Trim;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/SequenceUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/SequenceUpdateReqVO.java
index f8dafe16..9e4de27c 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/SequenceUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/SequenceUpdateReqVO.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.cms.controller.misc.request;
import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/SoundCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/SoundCreateReqVO.java
index 09401b18..f33a2476 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/SoundCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/SoundCreateReqVO.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.controller.misc.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
import org.springframework.web.multipart.MultipartFile;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/SoundUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/SoundUpdateReqVO.java
index 9efaa42c..9a61cd97 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/SoundUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/SoundUpdateReqVO.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.controller.misc.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
import org.springframework.web.multipart.MultipartFile;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/TelecomVendorCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/TelecomVendorCreateReqVO.java
index c758d04a..97a81925 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/TelecomVendorCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/TelecomVendorCreateReqVO.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.controller.misc.request;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/TelecomVendorUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/TelecomVendorUpdateReqVO.java
index 978caaba..987c915a 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/TelecomVendorUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/misc/request/TelecomVendorUpdateReqVO.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.controller.misc.request;
import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneAliasController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneAliasController.java
index da1fe991..a140c970 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneAliasController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneAliasController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.cms.controller.phone;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.cms.service.phone.PhoneAliasService;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.cms.controller.phone.model.PhoneAliasVO;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.phone.request.PhoneAliasUpdateReqVO;
import com.pudonghot.yo.cms.controller.phone.request.PhoneAliasCreateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneBlacklistController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneBlacklistController.java
index 2fc5cc49..2db749a8 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneBlacklistController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneBlacklistController.java
@@ -4,8 +4,8 @@ import com.pudonghot.yo.cms.controller.phone.model.PhoneBlacklistVO;
import com.pudonghot.yo.cms.controller.phone.request.PhoneBlacklistUpdateReqVO;
import com.pudonghot.yo.cms.service.phone.PhoneBlacklistService;
import com.pudonghot.yo.cms.service.phone.model.PhoneBlacklistBO;
-import me.chyxion.tigon.web.controller.annotation.Api;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.cms.controller.phone.request.PhoneBlacklistCreateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneGreylistController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneGreylistController.java
index bc414aab..29df7667 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneGreylistController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneGreylistController.java
@@ -1,9 +1,9 @@
package com.pudonghot.yo.cms.controller.phone;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.cms.service.phone.PhoneGreylistService;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.phone.model.PhoneGreylistVO;
import com.pudonghot.yo.cms.controller.phone.request.PhoneGreylistCreateReqVO;
import com.pudonghot.yo.cms.controller.phone.request.PhoneGreylistUpdateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneListController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneListController.java
index 2628f8e3..50eccd6d 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneListController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneListController.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.cms.controller.phone;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import com.pudonghot.yo.cms.service.phone.PhoneListService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneWhitelistController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneWhitelistController.java
index a44168f3..d462b652 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneWhitelistController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/PhoneWhitelistController.java
@@ -1,9 +1,9 @@
package com.pudonghot.yo.cms.controller.phone;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.cms.service.phone.PhoneWhitelistService;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.phone.model.PhoneWhitelistVO;
import com.pudonghot.yo.cms.controller.phone.request.PhoneWhitelistUpdateReqVO;
import com.pudonghot.yo.cms.controller.phone.request.PhoneWhitelistCreateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/PhoneAliasCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/PhoneAliasCreateReqVO.java
index 65de6bdd..a6d11bb6 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/PhoneAliasCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/PhoneAliasCreateReqVO.java
@@ -2,8 +2,8 @@ package com.pudonghot.yo.cms.controller.phone.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/PhoneGreylistCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/PhoneGreylistCreateReqVO.java
index 16bbf696..e6ef1a26 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/PhoneGreylistCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/PhoneGreylistCreateReqVO.java
@@ -4,7 +4,7 @@ import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import lombok.ToString;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/PhoneGreylistUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/PhoneGreylistUpdateReqVO.java
index d813634c..bf20e966 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/PhoneGreylistUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/PhoneGreylistUpdateReqVO.java
@@ -4,7 +4,7 @@ import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import lombok.ToString;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/PhoneListCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/PhoneListCreateReqVO.java
index ed808958..68b5c971 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/PhoneListCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/PhoneListCreateReqVO.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.controller.phone.request;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/UploadPhoneListReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/UploadPhoneListReqVO.java
index 4a6cff2f..d3fdbb26 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/UploadPhoneListReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/phone/request/UploadPhoneListReqVO.java
@@ -4,7 +4,7 @@ import com.pudonghot.yo.cms.request.BaseCreateReqVO;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import org.springframework.web.multipart.MultipartFile;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/queue/QueueController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/queue/QueueController.java
index 854934d0..e754cf48 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/queue/QueueController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/queue/QueueController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.cms.controller.queue;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.cms.service.queue.QueueService;
import com.pudonghot.yo.cms.controller.queue.model.QueueVO;
import org.springframework.web.bind.annotation.RequestMapping;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.queue.request.QueueListReqVO;
import com.pudonghot.yo.cms.controller.queue.request.QueueCreateReqVO;
import com.pudonghot.yo.cms.controller.queue.request.QueueUpdateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/queue/request/QueueCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/queue/request/QueueCreateReqVO.java
index 016b34aa..caf76b9c 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/queue/request/QueueCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/queue/request/QueueCreateReqVO.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.controller.queue.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/queue/request/QueueListReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/queue/request/QueueListReqVO.java
index b6b9e344..774d2684 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/queue/request/QueueListReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/queue/request/QueueListReqVO.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.controller.queue.request;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import me.chyxion.tigon.annotation.Trim;
-import me.chyxion.tigon.web.controller.request.ListCtrlrReq;
+import com.pudonghot.tigon.annotation.Trim;
+import com.pudonghot.tigon.web.controller.request.ListCtrlrReq;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/queue/request/QueueUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/queue/request/QueueUpdateReqVO.java
index 3a9b19af..cc543e65 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/queue/request/QueueUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/queue/request/QueueUpdateReqVO.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.controller.queue.request;
import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/tag/TagController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/tag/TagController.java
index 3c6cc9ae..957cb214 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/tag/TagController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/tag/TagController.java
@@ -2,13 +2,13 @@ package com.pudonghot.yo.cms.controller.tag;
import com.pudonghot.yo.webauth.SessionAbility;
import com.pudonghot.yo.cms.service.tag.TagService;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.cms.controller.tag.model.TagVO;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.cms.controller.tag.request.TagListReqVO;
import com.pudonghot.yo.cms.controller.tag.request.TagCreateReqVO;
import com.pudonghot.yo.cms.controller.tag.request.TagUpdateReqVO;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/tag/request/TagCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/tag/request/TagCreateReqVO.java
index 9d383eb0..85b7a982 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/tag/request/TagCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/tag/request/TagCreateReqVO.java
@@ -3,10 +3,10 @@ package com.pudonghot.yo.cms.controller.tag.request;
import com.pudonghot.yo.basic.model.enumeration.tag.TagScopeEnum;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import com.pudonghot.tigon.annotation.Trim;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/tag/request/TagListReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/tag/request/TagListReqVO.java
index 6e2fd222..d50a18a4 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/tag/request/TagListReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/tag/request/TagListReqVO.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.controller.tag.request;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import me.chyxion.tigon.web.controller.annotation.Principal;
-import me.chyxion.tigon.web.controller.request.ListCtrlrReq;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.web.controller.request.ListCtrlrReq;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/tag/request/TagUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/tag/request/TagUpdateReqVO.java
index c7ccebde..01244c8e 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/tag/request/TagUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/tag/request/TagUpdateReqVO.java
@@ -4,10 +4,10 @@ import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
import com.pudonghot.yo.basic.model.enumeration.tag.TagScopeEnum;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import com.pudonghot.tigon.annotation.Trim;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/tenant/TenantController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/tenant/TenantController.java
index 3f73384d..ba147545 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/tenant/TenantController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/tenant/TenantController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.cms.controller.tenant;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.cms.service.tenant.TenantService;
import com.pudonghot.yo.cms.controller.tenant.model.TenantVO;
import org.springframework.web.bind.annotation.RequestMapping;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.tenant.request.TenantListReqVO;
import com.pudonghot.yo.cms.controller.tenant.request.TenantCreateReqVO;
import com.pudonghot.yo.cms.controller.tenant.request.TenantUpdateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/tenant/request/TenantCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/tenant/request/TenantCreateReqVO.java
index 95e8c5ca..b625f53b 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/tenant/request/TenantCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/tenant/request/TenantCreateReqVO.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.controller.tenant.request;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/tenant/request/TenantListReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/tenant/request/TenantListReqVO.java
index 216cda98..4f5f1a39 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/tenant/request/TenantListReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/tenant/request/TenantListReqVO.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.controller.tenant.request;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import me.chyxion.tigon.web.controller.request.ListCtrlrReq;
+import com.pudonghot.tigon.web.controller.request.ListCtrlrReq;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/tenant/request/TenantUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/tenant/request/TenantUpdateReqVO.java
index b8a8f220..fb23caad 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/tenant/request/TenantUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/tenant/request/TenantUpdateReqVO.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.controller.tenant.request;
import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/TrunkAttrController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/TrunkAttrController.java
index 1df045c8..c6adffa6 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/TrunkAttrController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/TrunkAttrController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.cms.controller.trunk;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.cms.service.trunk.TrunkAttrService;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.cms.controller.trunk.model.TrunkAttrVO;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.trunk.request.TrunkAttrCreateReqVO;
import com.pudonghot.yo.cms.controller.trunk.request.TrunkAttrUpdateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/TrunkController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/TrunkController.java
index 5cbb7cc6..cbfbc3df 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/TrunkController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/TrunkController.java
@@ -1,13 +1,13 @@
package com.pudonghot.yo.cms.controller.trunk;
-import me.chyxion.tigon.kit.bean.BeanService;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.cms.service.trunk.TrunkService;
import org.springframework.web.bind.annotation.GetMapping;
import com.pudonghot.yo.cms.controller.trunk.model.TrunkVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.trunk.request.TrunkCreateReqVO;
import com.pudonghot.yo.cms.controller.trunk.request.TrunkUpdateReqVO;
import com.pudonghot.yo.cms.controller.trunk.response.TrunkCreateDataVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/TrunkProhibitedAreaCodeController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/TrunkProhibitedAreaCodeController.java
index 7ddb5cbb..b97ff3d0 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/TrunkProhibitedAreaCodeController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/TrunkProhibitedAreaCodeController.java
@@ -1,8 +1,8 @@
package com.pudonghot.yo.cms.controller.trunk;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.web.bind.annotation.RequestMapping;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.service.trunk.TrunkProhibitedAreaCodeService;
import com.pudonghot.yo.cms.controller.trunk.model.TrunkProhibitedAreaCodeVO;
import com.pudonghot.yo.cms.controller.trunk.request.TrunkProhibitedAreaCodeCreateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/TrunkStrategyController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/TrunkStrategyController.java
index 98d80b9a..1219f3b0 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/TrunkStrategyController.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/TrunkStrategyController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.cms.controller.trunk;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.cms.service.trunk.TrunkStrategyService;
import com.pudonghot.yo.basic.model.enumeration.TrunkStrategyEnum;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.cms.controller.trunk.model.TrunkStrategyVO;
import com.pudonghot.yo.cms.controller.trunk.request.TrunkStrategyCreateReqVO;
import com.pudonghot.yo.cms.controller.trunk.request.TrunkStrategyUpdateReqVO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkAttrCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkAttrCreateReqVO.java
index b8ac188e..a1210bd7 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkAttrCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkAttrCreateReqVO.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.cms.controller.trunk.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import com.pudonghot.tigon.annotation.Trim;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkAttrUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkAttrUpdateReqVO.java
index 304f3deb..10fcb2be 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkAttrUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkAttrUpdateReqVO.java
@@ -4,8 +4,8 @@ import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkCreateReqVO.java
index aa75e799..6503d178 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkCreateReqVO.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.cms.controller.trunk.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.request.TaggableReqVO;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
import com.pudonghot.yo.basic.model.enumeration.TrunkInboundTargetTypeEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkProhibitedAreaCodeCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkProhibitedAreaCodeCreateReqVO.java
index 8fb1e8a2..cd3dfa58 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkProhibitedAreaCodeCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkProhibitedAreaCodeCreateReqVO.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.controller.trunk.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkStrategyCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkStrategyCreateReqVO.java
index 70574b8f..dbf82d5a 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkStrategyCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkStrategyCreateReqVO.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.controller.trunk.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.request.BaseCreateReqVO;
import com.pudonghot.yo.basic.model.enumeration.TrunkStrategyEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkStrategyUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkStrategyUpdateReqVO.java
index 9d8d3659..62c18322 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkStrategyUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkStrategyUpdateReqVO.java
@@ -2,8 +2,8 @@ package com.pudonghot.yo.cms.controller.trunk.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
import com.pudonghot.yo.basic.model.enumeration.TrunkStrategyEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkUpdateReqVO.java
index 5aa78bf5..159e0b9a 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/request/TrunkUpdateReqVO.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.controller.trunk.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import com.pudonghot.yo.cms.request.TaggableReqVO;
import com.pudonghot.yo.cms.request.BaseUpdateReqVO;
import com.pudonghot.yo.basic.model.enumeration.TrunkInboundTargetTypeEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/request/BaseCreateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/request/BaseCreateReqVO.java
index e7316789..e397a493 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/request/BaseCreateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/request/BaseCreateReqVO.java
@@ -4,10 +4,10 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import me.chyxion.tigon.web.controller.annotation.Principal;
-import me.chyxion.tigon.web.controller.annotation.TenantId;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.web.controller.annotation.TenantId;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/request/BaseUpdateReqVO.java b/cms/src/main/java/com/pudonghot/yo/cms/request/BaseUpdateReqVO.java
index ca591574..4c285efc 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/request/BaseUpdateReqVO.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/request/BaseUpdateReqVO.java
@@ -4,10 +4,10 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import me.chyxion.tigon.web.controller.annotation.TenantId;
-import me.chyxion.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import com.pudonghot.tigon.web.controller.annotation.TenantId;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/agent/impl/AgentGroupServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/agent/impl/AgentGroupServiceImpl.java
index 90c7aae0..fb0d6091 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/agent/impl/AgentGroupServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/agent/impl/AgentGroupServiceImpl.java
@@ -14,11 +14,11 @@ import lombok.extern.slf4j.Slf4j;
import java.util.Map;
import java.util.stream.Collectors;
-import me.chyxion.tigon.dal.hook.AuthHook;
-import me.chyxion.tigon.service.request.DeleteServReq;
-import me.chyxion.tigon.service.request.FindServReq;
-import me.chyxion.tigon.service.request.ListServReq;
-import me.chyxion.tigon.service.response.ListServResp;
+import com.pudonghot.tigon.dal.hook.AuthHook;
+import com.pudonghot.tigon.service.request.DeleteServReq;
+import com.pudonghot.tigon.service.request.FindServReq;
+import com.pudonghot.tigon.service.request.ListServReq;
+import com.pudonghot.tigon.service.response.ListServResp;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.pudonghot.yo.dal.agent.AgentGroupDal;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/agent/impl/AgentServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/agent/impl/AgentServiceImpl.java
index 4ddd2c23..91e843e0 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/agent/impl/AgentServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/agent/impl/AgentServiceImpl.java
@@ -16,18 +16,18 @@ import com.pudonghot.yo.dal.agent.AgentGroupDal;
import com.pudonghot.yo.dal.queue.QueueAgentDal;
import com.pudonghot.yo.dal.agent.AgentStatusDal;
import org.apache.commons.lang3.RandomStringUtils;
-import me.chyxion.tigon.dal.hook.AuthHook;
+import com.pudonghot.tigon.dal.hook.AuthHook;
import com.pudonghot.yo.dal.queue.model.QueueAgent;
-import me.chyxion.tigon.service.request.FindServReq;
-import me.chyxion.tigon.service.request.ListServReq;
-import me.chyxion.tigon.service.response.ListServResp;
+import com.pudonghot.tigon.service.request.FindServReq;
+import com.pudonghot.tigon.service.request.ListServReq;
+import com.pudonghot.tigon.service.response.ListServResp;
import org.springframework.context.event.EventListener;
import com.pudonghot.yo.cms.service.agent.AgentService;
import com.pudonghot.yo.cms.service.agent.model.AgentBO;
import com.pudonghot.yo.cms.service.misc.SequenceService;
import org.springframework.beans.factory.annotation.Value;
import com.pudonghot.yo.cms.service.request.TaggableServReq;
-import me.chyxion.tigon.service.event.EntityBatchDeletedEvent;
+import com.pudonghot.tigon.service.event.EntityBatchDeletedEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.pudonghot.yo.cms.service.tag.impl.TaggableServiceImpl;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentBatchCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentBatchCreateServReq.java
index 79f7259e..ebb18201 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentBatchCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentBatchCreateServReq.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.service.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import org.hibernate.validator.constraints.Range;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.pudonghot.yo.basic.model.enumeration.AgentTypeEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentCreateServReq.java
index 5abc83f5..3863db9c 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentCreateServReq.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.service.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import org.hibernate.validator.constraints.Range;
import com.pudonghot.yo.basic.model.enumeration.AgentTypeEnum;
import com.pudonghot.yo.cms.service.request.TaggableCreateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentGroupCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentGroupCreateServReq.java
index 218d8e1d..08e9bb9c 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentGroupCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentGroupCreateServReq.java
@@ -3,10 +3,10 @@ package com.pudonghot.yo.cms.service.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import com.pudonghot.yo.cms.service.request.TaggableCreateServReq;
import com.pudonghot.yo.basic.model.enumeration.PrivacyLevelEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentGroupUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentGroupUpdateServReq.java
index b39ebf24..5a4b42a2 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentGroupUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentGroupUpdateServReq.java
@@ -3,10 +3,10 @@ package com.pudonghot.yo.cms.service.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.service.request.TaggableUpdateServReq;
import com.pudonghot.yo.basic.model.enumeration.PrivacyLevelEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentUpdateServReq.java
index c73e4a94..38710ec5 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/agent/request/AgentUpdateServReq.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.service.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import org.hibernate.validator.constraints.Range;
import com.pudonghot.yo.basic.model.enumeration.AgentTypeEnum;
import com.pudonghot.yo.cms.service.request.TaggableUpdateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/auth/impl/AuthPermissionServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/auth/impl/AuthPermissionServiceImpl.java
index 2b00db8d..c71a3c72 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/auth/impl/AuthPermissionServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/auth/impl/AuthPermissionServiceImpl.java
@@ -7,11 +7,11 @@ import java.util.stream.Collectors;
import org.springframework.util.Assert;
import com.pudonghot.yo.dal.auth.AuthRoleDal;
import org.springframework.stereotype.Service;
-import me.chyxion.tigon.service.request.FindServReq;
+import com.pudonghot.tigon.service.request.FindServReq;
import com.pudonghot.yo.dal.auth.AuthPermissionDal;
-import me.chyxion.tigon.service.request.ListServReq;
-import me.chyxion.tigon.service.request.DeleteServReq;
-import me.chyxion.tigon.service.response.ListServResp;
+import com.pudonghot.tigon.service.request.ListServReq;
+import com.pudonghot.tigon.service.request.DeleteServReq;
+import com.pudonghot.tigon.service.response.ListServResp;
import com.pudonghot.yo.dal.auth.model.AuthPermission;
import com.pudonghot.yo.dal.auth.AuthPermissionRoleDal;
import com.pudonghot.yo.cms.service.auth.model.AuthRoleBO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/auth/impl/AuthUserServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/auth/impl/AuthUserServiceImpl.java
index 822f4a5b..2e80b1cf 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/auth/impl/AuthUserServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/auth/impl/AuthUserServiceImpl.java
@@ -16,16 +16,16 @@ import com.pudonghot.yo.dal.auth.model.AuthUser;
import com.pudonghot.yo.dal.auth.AuthUserRoleDal;
import com.pudonghot.yo.dal.auth.AuthUserTenantDal;
import org.apache.commons.codec.digest.DigestUtils;
-import me.chyxion.tigon.service.request.FindServReq;
-import me.chyxion.tigon.service.request.ListServReq;
+import com.pudonghot.tigon.service.request.FindServReq;
+import com.pudonghot.tigon.service.request.ListServReq;
import com.pudonghot.yo.dal.auth.model.AuthUserRole;
-import me.chyxion.tigon.service.request.DeleteServReq;
-import me.chyxion.tigon.service.response.ListServResp;
+import com.pudonghot.tigon.service.request.DeleteServReq;
+import com.pudonghot.tigon.service.response.ListServResp;
import com.pudonghot.yo.dal.auth.model.AuthUserTenant;
import org.springframework.context.event.EventListener;
import com.pudonghot.yo.cms.service.auth.AuthUserService;
import com.pudonghot.yo.cms.service.auth.model.AuthUserBO;
-import me.chyxion.tigon.service.event.EntityBatchDeletedEvent;
+import com.pudonghot.tigon.service.event.EntityBatchDeletedEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.pudonghot.yo.cms.service.tag.impl.TaggableServiceImpl;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthPermissionCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthPermissionCreateServReq.java
index 660c6f1b..c4e25297 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthPermissionCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthPermissionCreateServReq.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.service.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.service.request.TaggableCreateServReq;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthRoleCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthRoleCreateServReq.java
index deb38226..7bcf2bd1 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthRoleCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthRoleCreateServReq.java
@@ -2,8 +2,8 @@ package com.pudonghot.yo.cms.service.auth.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.service.request.TaggableCreateServReq;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthUserBatchCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthUserBatchCreateServReq.java
index 0d4e81f9..c0963bf4 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthUserBatchCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthUserBatchCreateServReq.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.service.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.service.request.TaggableCreateServReq;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthUserCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthUserCreateServReq.java
index 88367414..3e63b413 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthUserCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthUserCreateServReq.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.service.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import org.hibernate.validator.constraints.Length;
import com.pudonghot.yo.cms.service.request.TaggableCreateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthUserUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthUserUpdateServReq.java
index ebd12e63..a0760d29 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthUserUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/auth/request/AuthUserUpdateServReq.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.service.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.service.request.TaggableUpdateServReq;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/CallingListService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/CallingListService.java
index 082287d7..48dcfb64 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/CallingListService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/CallingListService.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.cms.service.callinglist;
import java.util.List;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.cms.service.callinglist.model.CallingListBO;
import com.pudonghot.yo.cms.service.callinglist.request.RevertServReq;
import com.pudonghot.yo.cms.service.callinglist.request.RedialServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/impl/CallingListHistoricalServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/impl/CallingListHistoricalServiceImpl.java
index af167576..08e4f6f1 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/impl/CallingListHistoricalServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/impl/CallingListHistoricalServiceImpl.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.cms.service.callinglist.impl;
import java.util.List;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import com.pudonghot.yo.dal.callinglist.CallingListHistoricalDal;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/impl/CallingListPreparedServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/impl/CallingListPreparedServiceImpl.java
index 81ceed34..58f708a1 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/impl/CallingListPreparedServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/impl/CallingListPreparedServiceImpl.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.service.callinglist.impl;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import com.pudonghot.yo.dal.callinglist.CallingListPreparedDal;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/impl/CallingListServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/impl/CallingListServiceImpl.java
index 5d681abd..675fc185 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/impl/CallingListServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/impl/CallingListServiceImpl.java
@@ -3,15 +3,15 @@ package com.pudonghot.yo.cms.service.callinglist.impl;
import lombok.val;
import java.util.*;
import lombok.extern.slf4j.Slf4j;
-import me.chyxion.tigon.dal.hook.AuthHook;
+import com.pudonghot.tigon.dal.hook.AuthHook;
import org.springframework.util.Assert;
import org.springframework.stereotype.Service;
-import me.chyxion.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
import com.pudonghot.yo.dal.campaign.CampaignDal;
-import me.chyxion.tigon.service.request.FindServReq;
-import me.chyxion.tigon.service.request.ListServReq;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
-import me.chyxion.tigon.service.response.ListServResp;
+import com.pudonghot.tigon.service.request.FindServReq;
+import com.pudonghot.tigon.service.request.ListServReq;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.response.ListServResp;
import com.pudonghot.yo.dal.callinglist.CallingListDal;
import com.pudonghot.yo.dal.callinglist.model.CallingList;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/CallingListCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/CallingListCreateServReq.java
index a4feb98e..a7c73031 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/CallingListCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/CallingListCreateServReq.java
@@ -5,8 +5,8 @@ import com.pudonghot.yo.dal.callinglist.model.CallingList;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
/**
* @author bingpo
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/CallingListUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/CallingListUpdateServReq.java
index a75e2b6a..232ee22a 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/CallingListUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/CallingListUpdateServReq.java
@@ -5,8 +5,8 @@ import com.pudonghot.yo.dal.callinglist.model.CallingList;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import java.util.Date;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/ImportHistoricalServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/ImportHistoricalServReq.java
index 021969b7..5157c4e1 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/ImportHistoricalServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/ImportHistoricalServReq.java
@@ -5,11 +5,11 @@ import lombok.Setter;
import lombok.ToString;
import java.util.Date;
import java.io.Serializable;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
import com.pudonghot.yo.basic.model.DailyTime;
-import me.chyxion.tigon.web.controller.annotation.Principal;
-import me.chyxion.tigon.web.controller.annotation.TenantId;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.web.controller.annotation.TenantId;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/ImportPreparedServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/ImportPreparedServReq.java
index 07e03e66..328ee5e7 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/ImportPreparedServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/ImportPreparedServReq.java
@@ -4,12 +4,12 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.basic.model.DailyTime;
-import me.chyxion.tigon.web.controller.annotation.TenantId;
-import me.chyxion.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.web.controller.annotation.TenantId;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/RedialServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/RedialServReq.java
index 1e60e560..6985da2b 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/RedialServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/RedialServReq.java
@@ -4,13 +4,13 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.basic.model.DailyTime;
import com.pudonghot.yo.dal.callinglist.model.CallingList;
-import me.chyxion.tigon.web.controller.annotation.TenantId;
-import me.chyxion.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.web.controller.annotation.TenantId;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/RevertServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/RevertServReq.java
index 785e602f..80340bf8 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/RevertServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/request/RevertServReq.java
@@ -4,12 +4,12 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.dal.callinglist.model.CallingList;
-import me.chyxion.tigon.web.controller.annotation.Principal;
-import me.chyxion.tigon.web.controller.annotation.TenantId;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.web.controller.annotation.TenantId;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/campaign/impl/CampaignServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/campaign/impl/CampaignServiceImpl.java
index f0af35b7..18918a95 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/campaign/impl/CampaignServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/campaign/impl/CampaignServiceImpl.java
@@ -13,18 +13,18 @@ import java.util.stream.Collectors;
import com.pudonghot.yo.dal.tag.TagDal;
import com.pudonghot.yo.dal.queue.QueueDal;
import org.apache.commons.lang3.StringUtils;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.springframework.stereotype.Service;
-import me.chyxion.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
import com.pudonghot.yo.dal.campaign.CampaignDal;
import com.fasterxml.jackson.annotation.JsonAlias;
-import me.chyxion.tigon.dal.hook.AuthHook;
+import com.pudonghot.tigon.dal.hook.AuthHook;
import com.pudonghot.yo.dal.trunk.TrunkStrategyDal;
import com.pudonghot.yo.dal.campaign.model.Campaign;
-import me.chyxion.tigon.service.request.FindServReq;
-import me.chyxion.tigon.service.request.ListServReq;
+import com.pudonghot.tigon.service.request.FindServReq;
+import com.pudonghot.tigon.service.request.ListServReq;
import com.pudonghot.yo.cms.service.tag.model.TagBO;
-import me.chyxion.tigon.service.response.ListServResp;
+import com.pudonghot.tigon.service.response.ListServResp;
import com.pudonghot.yo.cms.service.queue.model.QueueBO;
import com.pudonghot.yo.cms.service.campaign.CampaignService;
import com.pudonghot.yo.dal.campaign.CampaignTrunkStrategyDal;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/campaign/request/CampaignCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/campaign/request/CampaignCreateServReq.java
index 22fc7ba0..3927bfc0 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/campaign/request/CampaignCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/campaign/request/CampaignCreateServReq.java
@@ -2,11 +2,11 @@ package com.pudonghot.yo.cms.service.campaign.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
import com.pudonghot.yo.basic.model.DailyTime;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.service.request.TaggableCreateServReq;
import com.pudonghot.yo.basic.model.campaign.enumeration.CampaignTypeEnum;
import com.pudonghot.yo.basic.model.campaign.enumeration.CampaignTargetTypeEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/campaign/request/CampaignUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/campaign/request/CampaignUpdateServReq.java
index 6eaa50c8..6ab4585c 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/campaign/request/CampaignUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/campaign/request/CampaignUpdateServReq.java
@@ -3,10 +3,10 @@ package com.pudonghot.yo.cms.service.campaign.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.basic.model.DailyTime;
import com.pudonghot.yo.cms.service.request.TaggableUpdateServReq;
import com.pudonghot.yo.basic.model.campaign.enumeration.CampaignTypeEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/cdr/CallDetailRecordService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/cdr/CallDetailRecordService.java
index c0deed24..185bee20 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/cdr/CallDetailRecordService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/cdr/CallDetailRecordService.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.cms.service.cdr;
import java.util.List;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.cms.service.cdr.model.CallDetailRecordBO;
import com.pudonghot.yo.cms.service.cdr.request.CallDetailRecordCreateServReq;
import com.pudonghot.yo.cms.service.cdr.request.CallDetailRecordUpdateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/cdr/impl/CallDetailRecordServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/cdr/impl/CallDetailRecordServiceImpl.java
index 5b58b981..ee51169c 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/cdr/impl/CallDetailRecordServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/cdr/impl/CallDetailRecordServiceImpl.java
@@ -6,7 +6,7 @@ import java.util.List;
import java.util.HashMap;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.springframework.stereotype.Service;
import com.pudonghot.yo.webauth.SessionAbility;
import com.pudonghot.yo.util.PhoneNumberUtils;
@@ -14,9 +14,9 @@ import com.pudonghot.yo.dal.auth.AuthPermissionDal;
import com.pudonghot.yo.dal.cdr.CallRecordingDal;
import com.pudonghot.yo.dal.cdr.CallDetailRecordDal;
import com.pudonghot.yo.tool.util.NumberPrivacyUtils;
-import me.chyxion.tigon.service.request.ListServReq;
-import me.chyxion.tigon.service.response.ListServResp;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.request.ListServReq;
+import com.pudonghot.tigon.service.response.ListServResp;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.dal.cdr.model.CallDetailRecord;
import org.springframework.beans.factory.annotation.Value;
import com.pudonghot.yo.basic.model.enumeration.CallTypeEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/cdr/request/CallDetailRecordAccountReportServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/cdr/request/CallDetailRecordAccountReportServReq.java
index 084dcf6e..c8a1e0ec 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/cdr/request/CallDetailRecordAccountReportServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/cdr/request/CallDetailRecordAccountReportServReq.java
@@ -5,7 +5,7 @@ import lombok.Setter;
import lombok.ToString;
import java.util.Date;
import java.io.Serializable;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/gateway/GatewayService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/gateway/GatewayService.java
index 49bac6f4..64f3eca0 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/gateway/GatewayService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/gateway/GatewayService.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.cms.service.gateway;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.cms.service.gateway.request.GatewayCreateServReq;
import com.pudonghot.yo.cms.service.gateway.request.GatewayUpdateServReq;
import com.pudonghot.yo.cms.service.gateway.model.GatewayBO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/gateway/impl/GatewayServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/gateway/impl/GatewayServiceImpl.java
index 7ddb697a..8da0e5b8 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/gateway/impl/GatewayServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/gateway/impl/GatewayServiceImpl.java
@@ -5,7 +5,7 @@ import com.pudonghot.yo.cms.service.gateway.request.GatewayUpdateServReq;
import com.pudonghot.yo.cms.service.gateway.GatewayService;
import com.pudonghot.yo.cms.service.gateway.model.GatewayBO;
import lombok.extern.slf4j.Slf4j;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import org.springframework.stereotype.Service;
import com.pudonghot.yo.dal.gateway.GatewayDal;
import com.pudonghot.yo.dal.gateway.model.Gateway;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/gateway/request/GatewayCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/gateway/request/GatewayCreateServReq.java
index b776b32f..22201edc 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/gateway/request/GatewayCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/gateway/request/GatewayCreateServReq.java
@@ -4,7 +4,7 @@ import com.pudonghot.yo.cms.service.request.BaseCreateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/gateway/request/GatewayUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/gateway/request/GatewayUpdateServReq.java
index f43f09ef..d63f0e16 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/gateway/request/GatewayUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/gateway/request/GatewayUpdateServReq.java
@@ -4,7 +4,7 @@ import com.pudonghot.yo.cms.service.request.BaseUpdateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/IvrEntryService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/IvrEntryService.java
index 6a789e75..dd265553 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/IvrEntryService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/IvrEntryService.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.cms.service.ivr;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.cms.service.ivr.model.IvrEntryBO;
import com.pudonghot.yo.cms.service.ivr.request.IvrEntryCreateServReq;
import com.pudonghot.yo.cms.service.ivr.request.IvrEntryUpdateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/IvrMenuService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/IvrMenuService.java
index f9732074..06b1ccc4 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/IvrMenuService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/IvrMenuService.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.cms.service.ivr;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.cms.service.ivr.model.IvrMenuBO;
import com.pudonghot.yo.cms.service.ivr.request.IvrMenuCreateServReq;
import com.pudonghot.yo.cms.service.ivr.request.IvrMenuUpdateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/SoundService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/SoundService.java
index 5f41ad14..132c5398 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/SoundService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/SoundService.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.cms.service.ivr;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.cms.service.ivr.model.SoundBO;
import com.pudonghot.yo.cms.service.ivr.request.SoundCreateServReq;
import com.pudonghot.yo.cms.service.ivr.request.SoundUpdateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/impl/IvrEntryServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/impl/IvrEntryServiceImpl.java
index aa9a6169..f1ecb5f8 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/impl/IvrEntryServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/impl/IvrEntryServiceImpl.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
import com.pudonghot.yo.cms.service.ivr.IvrEntryService;
import com.pudonghot.yo.cms.service.ivr.request.IvrEntryCreateServReq;
import com.pudonghot.yo.cms.service.ivr.request.IvrEntryUpdateServReq;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/impl/IvrMenuServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/impl/IvrMenuServiceImpl.java
index f915c4dd..a7806cc2 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/impl/IvrMenuServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/impl/IvrMenuServiceImpl.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
import com.pudonghot.yo.cms.service.ivr.IvrMenuService;
import com.pudonghot.yo.cms.service.ivr.request.IvrMenuUpdateServReq;
import com.pudonghot.yo.cms.service.ivr.request.IvrMenuCreateServReq;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/impl/SoundServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/impl/SoundServiceImpl.java
index 3fba18f9..9cf1e377 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/impl/SoundServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/impl/SoundServiceImpl.java
@@ -4,21 +4,21 @@ import lombok.val;
import java.io.File;
import java.io.IOException;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.util.Assert;
import org.apache.commons.io.FileUtils;
import com.pudonghot.yo.dal.ivr.SoundDal;
import org.apache.commons.io.FilenameUtils;
import com.pudonghot.yo.util.FileSizeUtils;
import com.pudonghot.yo.dal.ivr.model.Sound;
import org.springframework.stereotype.Service;
-import me.chyxion.tigon.kit.sequence.IdSequence;
-import me.chyxion.tigon.service.request.FindServReq;
-import me.chyxion.tigon.service.request.ListServReq;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
-import me.chyxion.tigon.service.response.ListServResp;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.service.request.FindServReq;
+import com.pudonghot.tigon.service.request.ListServReq;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.response.ListServResp;
import com.pudonghot.yo.cms.service.ivr.SoundService;
import org.apache.commons.lang3.time.DateFormatUtils;
import com.pudonghot.yo.cms.service.ivr.model.SoundBO;
+import org.springframework.util.Assert;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/IvrEntryCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/IvrEntryCreateServReq.java
index fdb89293..97471202 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/IvrEntryCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/IvrEntryCreateServReq.java
@@ -4,8 +4,8 @@ import com.pudonghot.yo.cms.service.request.BaseCreateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/IvrEntryUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/IvrEntryUpdateServReq.java
index 63169d23..8bfe0c90 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/IvrEntryUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/IvrEntryUpdateServReq.java
@@ -4,7 +4,7 @@ import com.pudonghot.yo.cms.service.request.BaseUpdateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/IvrMenuCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/IvrMenuCreateServReq.java
index 4e9dc7c5..0142f7a0 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/IvrMenuCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/IvrMenuCreateServReq.java
@@ -4,9 +4,9 @@ import com.pudonghot.yo.cms.service.request.BaseCreateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/IvrMenuUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/IvrMenuUpdateServReq.java
index 72b5aff2..1f670ec1 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/IvrMenuUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/IvrMenuUpdateServReq.java
@@ -4,8 +4,8 @@ import com.pudonghot.yo.cms.service.request.BaseUpdateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/SoundCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/SoundCreateServReq.java
index ea3fee8f..a47a769c 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/SoundCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/SoundCreateServReq.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.service.ivr.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.springframework.web.multipart.MultipartFile;
import com.pudonghot.yo.cms.service.request.BaseCreateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/SoundUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/SoundUpdateServReq.java
index eac7186e..888e258d 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/SoundUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/ivr/request/SoundUpdateServReq.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.service.ivr.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.springframework.web.multipart.MultipartFile;
import com.pudonghot.yo.cms.service.request.BaseUpdateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/AreaCodeService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/AreaCodeService.java
index 24aefb07..c828c58d 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/AreaCodeService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/AreaCodeService.java
@@ -1,8 +1,8 @@
package com.pudonghot.yo.cms.service.misc;
import java.util.Set;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.service.tag.TaggableService;
import com.pudonghot.yo.cms.service.misc.model.AreaCodeBO;
import com.pudonghot.yo.cms.service.misc.request.AreaCodeCreateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/SequenceService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/SequenceService.java
index 88d38f0b..1e47f58f 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/SequenceService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/SequenceService.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.cms.service.misc;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.cms.service.misc.model.SequenceBO;
import com.pudonghot.yo.cms.service.misc.request.SequenceCreateServReq;
import com.pudonghot.yo.cms.service.misc.request.SequenceUpdateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/TelecomVendorService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/TelecomVendorService.java
index 8a4c5ccf..51553147 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/TelecomVendorService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/TelecomVendorService.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.service.misc;
import com.pudonghot.yo.cms.service.misc.request.TelecomVendorCreateServReq;
import com.pudonghot.yo.cms.service.misc.request.TelecomVendorUpdateServReq;
import com.pudonghot.yo.cms.service.misc.model.TelecomVendorBO;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/impl/SequenceServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/impl/SequenceServiceImpl.java
index 97088b51..5dbbd973 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/impl/SequenceServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/impl/SequenceServiceImpl.java
@@ -8,7 +8,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.pudonghot.yo.dal.misc.SequenceDal;
import com.pudonghot.yo.dal.misc.model.Sequence;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.cms.service.misc.SequenceService;
import com.pudonghot.yo.cms.service.misc.model.SequenceBO;
import org.springframework.transaction.annotation.Transactional;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/impl/TelecomVendorServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/impl/TelecomVendorServiceImpl.java
index 2e7e908f..e59e1434 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/impl/TelecomVendorServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/impl/TelecomVendorServiceImpl.java
@@ -4,7 +4,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import com.pudonghot.yo.dal.misc.TelecomVendorDal;
import com.pudonghot.yo.dal.misc.model.TelecomVendor;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.cms.service.misc.TelecomVendorService;
import com.pudonghot.yo.cms.service.misc.model.TelecomVendorBO;
import com.pudonghot.yo.cms.service.misc.request.TelecomVendorCreateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/AreaCodeCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/AreaCodeCreateServReq.java
index ce6d1c15..3e2a3a5f 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/AreaCodeCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/AreaCodeCreateServReq.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.service.misc.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.service.request.TaggableCreateServReq;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/AreaCodeUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/AreaCodeUpdateServReq.java
index 883a4f0c..447a436d 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/AreaCodeUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/AreaCodeUpdateServReq.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.service.misc.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.service.request.TaggableUpdateServReq;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/SequenceCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/SequenceCreateServReq.java
index 9f532940..6919580b 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/SequenceCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/SequenceCreateServReq.java
@@ -4,7 +4,7 @@ import com.pudonghot.yo.cms.service.request.BaseCreateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.*;
+import jakarta.validation.constraints.*;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/SequenceUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/SequenceUpdateServReq.java
index cf8d5ef1..9b992c95 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/SequenceUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/SequenceUpdateServReq.java
@@ -4,9 +4,9 @@ import com.pudonghot.yo.cms.service.request.BaseUpdateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/TelecomVendorCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/TelecomVendorCreateServReq.java
index cb57f591..035a28e9 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/TelecomVendorCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/TelecomVendorCreateServReq.java
@@ -4,7 +4,7 @@ import com.pudonghot.yo.cms.service.request.BaseCreateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/TelecomVendorUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/TelecomVendorUpdateServReq.java
index 6843be09..b63ddcde 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/TelecomVendorUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/misc/request/TelecomVendorUpdateServReq.java
@@ -4,7 +4,7 @@ import com.pudonghot.yo.cms.service.request.BaseUpdateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/PhoneAliasService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/PhoneAliasService.java
index 2b549cb9..bf25630c 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/PhoneAliasService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/PhoneAliasService.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.cms.service.phone;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.cms.service.phone.model.PhoneAliasBO;
import com.pudonghot.yo.cms.service.phone.request.PhoneAliasCreateServReq;
import com.pudonghot.yo.cms.service.phone.request.PhoneAliasUpdateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/PhoneListService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/PhoneListService.java
index 98d775a8..797e8410 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/PhoneListService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/PhoneListService.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.service.phone;
import com.pudonghot.yo.cms.service.phone.model.PhoneListBO;
import com.pudonghot.yo.cms.service.request.BaseUpdateServReq;
import com.pudonghot.yo.cms.service.phone.request.UploadPhoneListCreateServReq;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.cms.service.phone.request.PhoneListCreateServReq;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/impl/PhoneAliasServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/impl/PhoneAliasServiceImpl.java
index 48d67933..e26e9852 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/impl/PhoneAliasServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/impl/PhoneAliasServiceImpl.java
@@ -9,7 +9,7 @@ import com.pudonghot.yo.dal.phone.PhoneAliasDal;
import org.apache.commons.lang3.RandomStringUtils;
import com.pudonghot.yo.dal.phone.model.PhoneAlias;
import com.pudonghot.yo.dal.cdr.CallDetailRecordDal;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import org.springframework.beans.factory.annotation.Value;
import com.pudonghot.yo.cms.service.phone.PhoneAliasService;
import com.pudonghot.yo.cms.service.phone.model.PhoneAliasBO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/impl/PhoneListServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/impl/PhoneListServiceImpl.java
index 48e2a1a0..6cbfbffe 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/impl/PhoneListServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/impl/PhoneListServiceImpl.java
@@ -5,19 +5,19 @@ import java.util.List;
import lombok.SneakyThrows;
import java.util.ArrayList;
import lombok.extern.slf4j.Slf4j;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import org.apache.commons.io.IOUtils;
import org.springframework.util.Assert;
import java.nio.charset.StandardCharsets;
import org.apache.commons.lang3.StringUtils;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import com.pudonghot.yo.dal.phone.model.PhoneList;
import com.pudonghot.yo.dal.cdr.CallDetailRecordDal;
-import me.chyxion.tigon.service.request.FindServReq;
-import me.chyxion.tigon.service.request.ListServReq;
+import com.pudonghot.tigon.service.request.FindServReq;
+import com.pudonghot.tigon.service.request.ListServReq;
import com.pudonghot.yo.tool.util.NumberPrivacyUtils;
-import me.chyxion.tigon.service.response.ListServResp;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.response.ListServResp;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.cms.service.phone.PhoneListService;
import com.pudonghot.yo.cms.service.phone.model.PhoneListBO;
import com.pudonghot.yo.cms.service.request.BaseUpdateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/PhoneAliasCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/PhoneAliasCreateServReq.java
index 36e26c0f..b9f95b04 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/PhoneAliasCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/PhoneAliasCreateServReq.java
@@ -4,7 +4,7 @@ import com.pudonghot.yo.cms.service.request.BaseCreateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/PhoneGreylistCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/PhoneGreylistCreateServReq.java
index 596d7600..f3a6ba2b 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/PhoneGreylistCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/PhoneGreylistCreateServReq.java
@@ -4,7 +4,7 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import java.util.Date;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/PhoneGreylistUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/PhoneGreylistUpdateServReq.java
index c5a2c1cc..296a60bd 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/PhoneGreylistUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/PhoneGreylistUpdateServReq.java
@@ -5,7 +5,7 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import java.util.Date;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/PhoneListCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/PhoneListCreateServReq.java
index a9750ed2..75b372d0 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/PhoneListCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/PhoneListCreateServReq.java
@@ -5,7 +5,7 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/UploadPhoneListCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/UploadPhoneListCreateServReq.java
index 63161d43..d5fb118e 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/UploadPhoneListCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/phone/request/UploadPhoneListCreateServReq.java
@@ -6,7 +6,7 @@ import lombok.Setter;
import lombok.ToString;
import org.springframework.web.multipart.MultipartFile;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/queue/QueueService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/queue/QueueService.java
index 7aa85176..01f7ba08 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/queue/QueueService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/queue/QueueService.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.service.queue;
import com.pudonghot.yo.cms.service.queue.request.QueueCreateServReq;
import com.pudonghot.yo.cms.service.queue.request.QueueUpdateServReq;
import com.pudonghot.yo.cms.service.queue.model.QueueBO;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/queue/impl/QueueServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/queue/impl/QueueServiceImpl.java
index 41e037b2..f2dc1078 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/queue/impl/QueueServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/queue/impl/QueueServiceImpl.java
@@ -8,7 +8,7 @@ import com.pudonghot.yo.dal.queue.QueueDal;
import com.pudonghot.yo.dal.tenant.TenantDal;
import org.springframework.stereotype.Service;
import com.pudonghot.yo.dal.queue.model.Queue;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.cms.service.queue.QueueService;
import com.pudonghot.yo.cms.service.queue.model.QueueBO;
import com.pudonghot.yo.cms.service.misc.SequenceService;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/queue/request/QueueCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/queue/request/QueueCreateServReq.java
index 36ca732b..71aa0c33 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/queue/request/QueueCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/queue/request/QueueCreateServReq.java
@@ -4,7 +4,7 @@ import com.pudonghot.yo.cms.service.request.BaseCreateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/queue/request/QueueUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/queue/request/QueueUpdateServReq.java
index dc012179..66131426 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/queue/request/QueueUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/queue/request/QueueUpdateServReq.java
@@ -4,7 +4,7 @@ import com.pudonghot.yo.cms.service.request.BaseUpdateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/request/BaseUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/request/BaseUpdateServReq.java
index 3ba27a0a..3d21c4ac 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/request/BaseUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/request/BaseUpdateServReq.java
@@ -2,8 +2,8 @@ package com.pudonghot.yo.cms.service.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
-import me.chyxion.tigon.service.request.UpdateServReq;
+import jakarta.validation.constraints.NotNull;
+import com.pudonghot.tigon.service.request.UpdateServReq;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/tag/TagService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/tag/TagService.java
index 21ca8326..443a03d3 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/tag/TagService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/tag/TagService.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.service.tag;
import com.pudonghot.yo.cms.service.tag.request.TagCreateServReq;
import com.pudonghot.yo.cms.service.tag.request.TagUpdateServReq;
import com.pudonghot.yo.cms.service.tag.model.TagBO;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/tag/TaggableService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/tag/TaggableService.java
index b87e59e6..1b2d30da 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/tag/TaggableService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/tag/TaggableService.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.cms.service.tag;
import com.pudonghot.yo.cms.service.request.TaggableUpdateServReq;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.cms.service.request.TaggableServReq;
import com.pudonghot.yo.cms.service.model.TaggableServModel;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/tag/impl/TagServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/tag/impl/TagServiceImpl.java
index c128f1b1..6ee5a43b 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/tag/impl/TagServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/tag/impl/TagServiceImpl.java
@@ -8,7 +8,7 @@ import com.pudonghot.yo.cms.service.tag.TagService;
import com.pudonghot.yo.cms.service.tag.model.TagBO;
import com.pudonghot.yo.cms.service.tag.request.TagCreateServReq;
import com.pudonghot.yo.cms.service.tag.request.TagUpdateServReq;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.basic.model.enumeration.tag.TagScopeEnum;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/tag/impl/TaggableServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/tag/impl/TaggableServiceImpl.java
index 49e904e0..8308b832 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/tag/impl/TaggableServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/tag/impl/TaggableServiceImpl.java
@@ -4,19 +4,19 @@ import lombok.val;
import java.util.*;
import lombok.extern.slf4j.Slf4j;
import java.util.stream.Collectors;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.util.SetUtils;
import com.pudonghot.yo.dal.tag.TagDal;
import org.apache.commons.lang3.tuple.Pair;
import com.pudonghot.yo.dal.tag.ObjectTagDal;
import com.pudonghot.yo.dal.model.BaseDbEntity;
import com.pudonghot.yo.dal.tag.model.ObjectTag;
-import me.chyxion.tigon.dal.hook.AuthHook;
-import me.chyxion.tigon.service.request.FindServReq;
-import me.chyxion.tigon.service.request.ListServReq;
-import me.chyxion.tigon.service.response.ListServResp;
-import me.chyxion.tigon.service.request.DeleteServReq;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.dal.hook.AuthHook;
+import com.pudonghot.tigon.service.request.FindServReq;
+import com.pudonghot.tigon.service.request.ListServReq;
+import com.pudonghot.tigon.service.response.ListServResp;
+import com.pudonghot.tigon.service.request.DeleteServReq;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.cms.service.tag.TaggableService;
import com.pudonghot.yo.cms.service.request.TaggableServReq;
import com.pudonghot.yo.cms.service.model.TaggableServModel;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/tag/request/TagCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/tag/request/TagCreateServReq.java
index 6398ed9d..274eaa5a 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/tag/request/TagCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/tag/request/TagCreateServReq.java
@@ -5,8 +5,8 @@ import com.pudonghot.yo.cms.service.request.BaseCreateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/tag/request/TagUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/tag/request/TagUpdateServReq.java
index 41d3a384..e879aaf5 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/tag/request/TagUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/tag/request/TagUpdateServReq.java
@@ -5,8 +5,8 @@ import com.pudonghot.yo.cms.service.request.BaseUpdateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/tenant/TenantService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/tenant/TenantService.java
index b15bd731..e396c911 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/tenant/TenantService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/tenant/TenantService.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.cms.service.tenant;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.cms.service.tenant.request.TenantUpdateServReq;
import com.pudonghot.yo.cms.service.tenant.request.TenantCreateServReq;
import com.pudonghot.yo.cms.service.tenant.model.TenantBO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/tenant/impl/TenantServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/tenant/impl/TenantServiceImpl.java
index ef685bb1..6ee231cc 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/tenant/impl/TenantServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/tenant/impl/TenantServiceImpl.java
@@ -5,9 +5,9 @@ import org.apache.commons.lang3.StringUtils;
import com.pudonghot.yo.dal.tenant.TenantDal;
import org.springframework.stereotype.Service;
import com.pudonghot.yo.dal.tenant.model.Tenant;
-import me.chyxion.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
import org.apache.commons.lang3.RandomStringUtils;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.cms.service.tenant.TenantService;
import com.pudonghot.yo.cms.service.tenant.model.TenantBO;
import org.springframework.beans.factory.annotation.Value;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/tenant/request/TenantCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/tenant/request/TenantCreateServReq.java
index 892139a9..b52339e8 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/tenant/request/TenantCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/tenant/request/TenantCreateServReq.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.service.tenant.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.service.request.BaseCreateServReq;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/tenant/request/TenantUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/tenant/request/TenantUpdateServReq.java
index 436238e6..457c1b45 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/tenant/request/TenantUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/tenant/request/TenantUpdateServReq.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.service.tenant.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.service.request.BaseUpdateServReq;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/TrunkAttrService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/TrunkAttrService.java
index 94beb1d8..b0b341c0 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/TrunkAttrService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/TrunkAttrService.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.service.trunk;
import com.pudonghot.yo.cms.service.trunk.request.TrunkAttrCreateServReq;
import com.pudonghot.yo.cms.service.trunk.model.TrunkAttrBO;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.cms.service.trunk.request.TrunkAttrUpdateServReq;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/TrunkProhibitedAreaCodeService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/TrunkProhibitedAreaCodeService.java
index b2bf43e3..5bc5e49a 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/TrunkProhibitedAreaCodeService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/TrunkProhibitedAreaCodeService.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.service.trunk;
import com.pudonghot.yo.cms.service.request.BaseUpdateServReq;
import com.pudonghot.yo.cms.service.trunk.request.TrunkProhibitedAreaCodeCreateServReq;
import com.pudonghot.yo.cms.service.trunk.model.TrunkProhibitedAreaCodeBO;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/TrunkStrategyService.java b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/TrunkStrategyService.java
index 4246afc2..87002aba 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/TrunkStrategyService.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/TrunkStrategyService.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.cms.service.trunk;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.cms.service.trunk.request.TrunkStrategyCreateServReq;
import com.pudonghot.yo.cms.service.trunk.request.TrunkStrategyUpdateServReq;
import com.pudonghot.yo.cms.service.trunk.model.TrunkStrategyBO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkAttrServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkAttrServiceImpl.java
index 99e67ee3..46ca5550 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkAttrServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkAttrServiceImpl.java
@@ -5,7 +5,7 @@ import org.springframework.util.Assert;
import org.springframework.stereotype.Service;
import com.pudonghot.yo.dal.trunk.TrunkAttrDal;
import com.pudonghot.yo.dal.trunk.model.TrunkAttr;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.cms.service.trunk.TrunkAttrService;
import com.pudonghot.yo.cms.service.trunk.model.TrunkAttrBO;
import com.pudonghot.yo.cms.service.trunk.request.TrunkAttrCreateServReq;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkProhibitedAreaCodeServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkProhibitedAreaCodeServiceImpl.java
index 3eb45991..95e2a697 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkProhibitedAreaCodeServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkProhibitedAreaCodeServiceImpl.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.service.trunk.impl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.dal.trunk.TrunkProhibitedAreaCodeDal;
import com.pudonghot.yo.cms.service.request.BaseUpdateServReq;
import com.pudonghot.yo.dal.trunk.model.TrunkProhibitedAreaCode;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkServiceImpl.java
index 8d8aabde..8ee6e682 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkServiceImpl.java
@@ -24,10 +24,10 @@ import com.pudonghot.yo.dal.gateway.GatewayDal;
import com.pudonghot.yo.dal.agent.AgentGroupDal;
import com.fasterxml.jackson.annotation.JsonAlias;
import com.pudonghot.yo.dal.misc.TelecomVendorDal;
-import me.chyxion.tigon.dal.hook.AuthHook;
-import me.chyxion.tigon.service.request.FindServReq;
-import me.chyxion.tigon.service.request.ListServReq;
-import me.chyxion.tigon.service.response.ListServResp;
+import com.pudonghot.tigon.dal.hook.AuthHook;
+import com.pudonghot.tigon.service.request.FindServReq;
+import com.pudonghot.tigon.service.request.ListServReq;
+import com.pudonghot.tigon.service.response.ListServResp;
import com.pudonghot.yo.cms.service.ivr.model.IvrMenuBO;
import com.pudonghot.yo.dal.trunk.model.TrunkTrunkAttr;
import com.pudonghot.yo.cms.service.trunk.model.TrunkBO;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkStrategyServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkStrategyServiceImpl.java
index 12816174..e9e6bc80 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkStrategyServiceImpl.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkStrategyServiceImpl.java
@@ -3,11 +3,11 @@ package com.pudonghot.yo.cms.service.trunk.impl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import com.pudonghot.yo.dal.trunk.TrunkStrategyDal;
-import me.chyxion.tigon.service.request.FindServReq;
-import me.chyxion.tigon.service.request.ListServReq;
+import com.pudonghot.tigon.service.request.FindServReq;
+import com.pudonghot.tigon.service.request.ListServReq;
import com.pudonghot.yo.dal.trunk.model.TrunkStrategy;
-import me.chyxion.tigon.service.response.ListServResp;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.response.ListServResp;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.cms.service.trunk.TrunkStrategyService;
import com.pudonghot.yo.cms.service.trunk.model.TrunkStrategyBO;
import com.pudonghot.yo.basic.model.enumeration.TrunkStrategyEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkAttrCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkAttrCreateServReq.java
index 214607af..8931033a 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkAttrCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkAttrCreateServReq.java
@@ -4,7 +4,7 @@ import com.pudonghot.yo.cms.service.request.BaseCreateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkAttrUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkAttrUpdateServReq.java
index 3223255d..c21e1ac8 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkAttrUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkAttrUpdateServReq.java
@@ -4,7 +4,7 @@ import com.pudonghot.yo.cms.service.request.BaseUpdateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkCreateServReq.java
index 965a7692..6f885365 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkCreateServReq.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.cms.service.trunk.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.service.request.TaggableCreateServReq;
import com.pudonghot.yo.basic.model.enumeration.TrunkInboundTargetTypeEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkProhibitedAreaCodeCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkProhibitedAreaCodeCreateServReq.java
index d8b34730..bdc6a2ad 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkProhibitedAreaCodeCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkProhibitedAreaCodeCreateServReq.java
@@ -4,8 +4,8 @@ import com.pudonghot.yo.cms.service.request.BaseCreateServReq;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
import java.util.List;
/**
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkStrategyCreateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkStrategyCreateServReq.java
index b70a8c9c..986eb9a5 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkStrategyCreateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkStrategyCreateServReq.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.service.trunk.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.service.request.BaseCreateServReq;
import com.pudonghot.yo.basic.model.enumeration.TrunkStrategyEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkStrategyUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkStrategyUpdateServReq.java
index 6cc83824..0b7b6934 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkStrategyUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkStrategyUpdateServReq.java
@@ -2,8 +2,8 @@ package com.pudonghot.yo.cms.service.trunk.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.cms.service.request.BaseUpdateServReq;
import com.pudonghot.yo.basic.model.enumeration.TrunkStrategyEnum;
diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkUpdateServReq.java b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkUpdateServReq.java
index 4b2ab481..0d0eff63 100644
--- a/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkUpdateServReq.java
+++ b/cms/src/main/java/com/pudonghot/yo/cms/service/trunk/request/TrunkUpdateServReq.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.service.trunk.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import com.pudonghot.yo.cms.service.request.TaggableUpdateServReq;
import com.pudonghot.yo.basic.model.enumeration.TrunkInboundTargetTypeEnum;
diff --git a/cms/src/test/java/com/pudonghot/yo/cms/service/BeanCopyTest.java b/cms/src/test/java/com/pudonghot/yo/cms/service/BeanCopyTest.java
index 2d89a695..7734e8e5 100644
--- a/cms/src/test/java/com/pudonghot/yo/cms/service/BeanCopyTest.java
+++ b/cms/src/test/java/com/pudonghot/yo/cms/service/BeanCopyTest.java
@@ -14,14 +14,14 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.val;
-import me.chyxion.tigon.service.response.ListServResp;
-import me.chyxion.tigon.web.controller.response.ListCtrlrResp;
+import com.pudonghot.tigon.service.response.ListServResp;
+import com.pudonghot.tigon.web.controller.response.ListCtrlrResp;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
import lombok.extern.slf4j.Slf4j;
import org.junit.runner.RunWith;
-import me.chyxion.tigon.kit.bean.BeanService;
-import me.chyxion.tigon.kit.config.TigonKitConfiguration;
+import com.pudonghot.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.config.TigonKitConfiguration;
import org.springframework.beans.BeanUtils;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/lib/aliyun/pom.xml b/lib/aliyun/pom.xml
index c78d7608..f071e07f 100644
--- a/lib/aliyun/pom.xml
+++ b/lib/aliyun/pom.xml
@@ -33,7 +33,7 @@
commons-io
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-kit
@@ -50,7 +50,7 @@
org.mockito
- mockito-inline
+ mockito-core
test
diff --git a/lib/aliyun/src/main/java/com/pudonghot/yo/lib/aliyun/oss/impl/OssServiceImpl.java b/lib/aliyun/src/main/java/com/pudonghot/yo/lib/aliyun/oss/impl/OssServiceImpl.java
index ab771e8d..95643558 100644
--- a/lib/aliyun/src/main/java/com/pudonghot/yo/lib/aliyun/oss/impl/OssServiceImpl.java
+++ b/lib/aliyun/src/main/java/com/pudonghot/yo/lib/aliyun/oss/impl/OssServiceImpl.java
@@ -7,7 +7,7 @@ import java.util.regex.Pattern;
import lombok.extern.slf4j.Slf4j;
import com.aliyun.oss.OSSClientBuilder;
import org.apache.commons.lang3.StringUtils;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.springframework.stereotype.Service;
import com.pudonghot.yo.lib.aliyun.sts.StsService;
import com.pudonghot.yo.lib.aliyun.oss.OssService;
diff --git a/lib/aliyun/src/main/java/com/pudonghot/yo/lib/aliyun/sts/StsService.java b/lib/aliyun/src/main/java/com/pudonghot/yo/lib/aliyun/sts/StsService.java
index 370512b0..ce5daac6 100644
--- a/lib/aliyun/src/main/java/com/pudonghot/yo/lib/aliyun/sts/StsService.java
+++ b/lib/aliyun/src/main/java/com/pudonghot/yo/lib/aliyun/sts/StsService.java
@@ -1,8 +1,8 @@
package com.pudonghot.yo.lib.aliyun.sts;
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import com.pudonghot.yo.lib.aliyun.sts.response.AcsServResp;
import com.pudonghot.yo.lib.aliyun.sts.request.GetAcsServReq;
diff --git a/lib/aliyun/src/main/java/com/pudonghot/yo/lib/aliyun/sts/impl/StsServiceImpl.java b/lib/aliyun/src/main/java/com/pudonghot/yo/lib/aliyun/sts/impl/StsServiceImpl.java
index e69183ea..59530f42 100644
--- a/lib/aliyun/src/main/java/com/pudonghot/yo/lib/aliyun/sts/impl/StsServiceImpl.java
+++ b/lib/aliyun/src/main/java/com/pudonghot/yo/lib/aliyun/sts/impl/StsServiceImpl.java
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
import com.aliyuncs.http.MethodType;
import com.aliyuncs.DefaultAcsClient;
import com.aliyuncs.profile.DefaultProfile;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.springframework.stereotype.Service;
import com.aliyuncs.auth.sts.AssumeRoleRequest;
import com.aliyuncs.exceptions.ClientException;
diff --git a/lib/aliyun/src/main/java/com/pudonghot/yo/lib/aliyun/sts/request/GetAcsServReq.java b/lib/aliyun/src/main/java/com/pudonghot/yo/lib/aliyun/sts/request/GetAcsServReq.java
index d0567c9e..d974d59c 100644
--- a/lib/aliyun/src/main/java/com/pudonghot/yo/lib/aliyun/sts/request/GetAcsServReq.java
+++ b/lib/aliyun/src/main/java/com/pudonghot/yo/lib/aliyun/sts/request/GetAcsServReq.java
@@ -4,7 +4,7 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/lib/dal/pom.xml b/lib/dal/pom.xml
index 86af4b48..e2962608 100644
--- a/lib/dal/pom.xml
+++ b/lib/dal/pom.xml
@@ -35,8 +35,8 @@
jackson-annotations
- javax.validation
- validation-api
+ jakarta.validation
+ jakarta.validation-api
@@ -58,11 +58,11 @@
tigon-mybatis
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-kit
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-dal
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentDal.java
index 9a1661da..a540fc70 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentDal.java
@@ -1,9 +1,9 @@
package com.pudonghot.yo.dal.agent;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import com.pudonghot.tigon.dal.BaseDal;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import com.pudonghot.yo.dal.agent.model.Agent;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentGroupCampaignWeightDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentGroupCampaignWeightDal.java
index 56bd6b3e..618325a1 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentGroupCampaignWeightDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentGroupCampaignWeightDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.agent;
import com.pudonghot.yo.dal.agent.model.AgentGroupCampaignWeight;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
/**
* 坐席组外呼活动权重
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentGroupDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentGroupDal.java
index 9180e3c3..0ea816e4 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentGroupDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentGroupDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.agent;
import com.pudonghot.yo.dal.agent.model.AgentGroup;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentGroupTrunkStrategyDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentGroupTrunkStrategyDal.java
index e65d20a5..57bdc977 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentGroupTrunkStrategyDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentGroupTrunkStrategyDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.agent;
import com.pudonghot.yo.dal.agent.model.AgentGroupTrunkStrategy;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.Collection;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentStatusDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentStatusDal.java
index 771ff2b2..ae4c3c4f 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentStatusDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentStatusDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.agent;
import java.util.function.Consumer;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.agent.model.AgentStatus;
import com.pudonghot.yo.dal.agent.request.ReqLockIdleOfQueue;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentDalImpl.java
index 03672c02..30b50e60 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentDalImpl.java
@@ -4,14 +4,14 @@ import java.util.List;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.agent.AgentDal;
import com.pudonghot.yo.dal.agent.model.Agent;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.request.FindDalReq;
-import me.chyxion.tigon.dal.request.ListDalReq;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.request.FindDalReq;
+import com.pudonghot.tigon.dal.request.ListDalReq;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.common.TaggableDalImpl;
import com.pudonghot.yo.dal.agent.mapper.AgentMapper;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
/**
* 坐席
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentGroupCampaignWeightDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentGroupCampaignWeightDalImpl.java
index f4b7bfcc..1f7b2fb8 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentGroupCampaignWeightDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentGroupCampaignWeightDalImpl.java
@@ -5,7 +5,7 @@ import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.agent.model.AgentGroupCampaignWeight;
import com.pudonghot.yo.dal.agent.mapper.AgentGroupCampaignWeightMapper;
import com.pudonghot.yo.dal.agent.AgentGroupCampaignWeightDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
/**
* 坐席组外呼活动权重
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentGroupDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentGroupDalImpl.java
index f6f79bd6..e375d523 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentGroupDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentGroupDalImpl.java
@@ -2,16 +2,16 @@ package com.pudonghot.yo.dal.agent.impl;
import java.util.List;
-import me.chyxion.tigon.dal.request.FindDalReq;
-import me.chyxion.tigon.dal.request.ListDalReq;
+import com.pudonghot.tigon.dal.request.FindDalReq;
+import com.pudonghot.tigon.dal.request.ListDalReq;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.agent.AgentGroupDal;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.dal.common.TaggableDalImpl;
import com.pudonghot.yo.dal.agent.model.AgentGroup;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
import com.pudonghot.yo.dal.agent.mapper.AgentGroupMapper;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentGroupTrunkStrategyDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentGroupTrunkStrategyDalImpl.java
index 3ff823fe..8349290e 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentGroupTrunkStrategyDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentGroupTrunkStrategyDalImpl.java
@@ -5,7 +5,7 @@ import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.agent.model.AgentGroupTrunkStrategy;
import com.pudonghot.yo.dal.agent.mapper.AgentGroupTrunkStrategyMapper;
import com.pudonghot.yo.dal.agent.AgentGroupTrunkStrategyDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import java.util.Collection;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentStatusDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentStatusDalImpl.java
index 427d9d97..a48af326 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentStatusDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentStatusDalImpl.java
@@ -5,13 +5,13 @@ import java.util.HashMap;
import lombok.extern.slf4j.Slf4j;
import java.util.function.Consumer;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.agent.AgentStatusDal;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.dal.agent.model.AgentStatus;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
import com.pudonghot.yo.dal.agent.mapper.AgentStatusMapper;
import com.pudonghot.yo.dal.agent.request.ReqLockIdleOfQueue;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/agentcase/WorkRecordDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/agentcase/WorkRecordDal.java
index 9efd8d6d..f7953101 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/agentcase/WorkRecordDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/agentcase/WorkRecordDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.agentcase;
import com.pudonghot.yo.dal.agentcase.model.WorkRecord;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
/**
* 工作记录
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/agentcase/impl/WorkRecordDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/agentcase/impl/WorkRecordDalImpl.java
index 7d8bbe77..209903d7 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/agentcase/impl/WorkRecordDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/agentcase/impl/WorkRecordDalImpl.java
@@ -4,7 +4,7 @@ import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.agentcase.model.WorkRecord;
import com.pudonghot.yo.dal.agentcase.mapper.WorkRecordMapper;
import com.pudonghot.yo.dal.agentcase.WorkRecordDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
/**
* 工作记录
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthPermissionDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthPermissionDal.java
index f658bb97..1b87034e 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthPermissionDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthPermissionDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.auth;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.dal.auth.model.AuthPermission;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthPermissionRoleDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthPermissionRoleDal.java
index 3c0235f0..060fdf3a 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthPermissionRoleDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthPermissionRoleDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.auth;
import com.pudonghot.yo.dal.auth.model.AuthPermissionRole;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.Collection;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthRoleDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthRoleDal.java
index c83659ec..54e2392c 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthRoleDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthRoleDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.auth;
import com.pudonghot.yo.dal.auth.model.AuthRole;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthUserDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthUserDal.java
index 70ee4278..89a96dc2 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthUserDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthUserDal.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.auth;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.dal.auth.model.AuthUser;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthUserRoleDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthUserRoleDal.java
index c7f7edb2..ee29d56e 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthUserRoleDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthUserRoleDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.auth;
import com.pudonghot.yo.dal.auth.model.AuthUserRole;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.Collection;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthUserTenantDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthUserTenantDal.java
index 8ffe5e19..5e03f2eb 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthUserTenantDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/AuthUserTenantDal.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.dal.auth;
import java.util.List;
import java.util.Collection;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.dal.auth.model.AuthUserTenant;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthPermissionDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthPermissionDalImpl.java
index b993f326..5dfe9c89 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthPermissionDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthPermissionDalImpl.java
@@ -2,12 +2,12 @@ package com.pudonghot.yo.dal.auth.impl;
import java.util.List;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.request.FindDalReq;
-import me.chyxion.tigon.dal.request.ListDalReq;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.request.FindDalReq;
+import com.pudonghot.tigon.dal.request.ListDalReq;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.auth.AuthPermissionDal;
import com.pudonghot.yo.dal.auth.model.AuthPermission;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthPermissionRoleDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthPermissionRoleDalImpl.java
index f464639b..b321b6c2 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthPermissionRoleDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthPermissionRoleDalImpl.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.dal.auth.impl;
import java.util.List;
import java.util.Collection;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.auth.AuthPermissionRoleDal;
import com.pudonghot.yo.dal.auth.model.AuthPermissionRole;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthRoleDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthRoleDalImpl.java
index f6006a4c..9f896f05 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthRoleDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthRoleDalImpl.java
@@ -1,13 +1,13 @@
package com.pudonghot.yo.dal.auth.impl;
-import me.chyxion.tigon.dal.annotation.FilterCol;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import com.pudonghot.tigon.mybatis.Search;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.auth.model.AuthRole;
import com.pudonghot.yo.dal.auth.mapper.AuthRoleMapper;
import com.pudonghot.yo.dal.auth.AuthRoleDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthUserDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthUserDalImpl.java
index ba1adc66..30a02a65 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthUserDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthUserDalImpl.java
@@ -2,11 +2,11 @@ package com.pudonghot.yo.dal.auth.impl;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.auth.AuthUserDal;
-import me.chyxion.tigon.dal.request.FindDalReq;
-import me.chyxion.tigon.dal.request.ListDalReq;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.request.FindDalReq;
+import com.pudonghot.tigon.dal.request.ListDalReq;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.dal.auth.model.AuthUser;
import com.pudonghot.yo.dal.common.TaggableDalImpl;
import com.pudonghot.yo.dal.auth.mapper.AuthUserMapper;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthUserTenantDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthUserTenantDalImpl.java
index c5b1560a..40ae9af6 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthUserTenantDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthUserTenantDalImpl.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.dal.auth.impl;
import java.util.List;
import java.util.Collection;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.auth.AuthUserTenantDal;
import com.pudonghot.yo.dal.auth.model.AuthUserTenant;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/CallingListDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/CallingListDal.java
index 26dda9b1..adcec351 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/CallingListDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/CallingListDal.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.dal.callinglist;
import java.util.Date;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.basic.model.DailyTime;
import com.pudonghot.yo.dal.callinglist.model.CallingList;
import com.pudonghot.yo.dal.callinglist.response.CallingListSummaryDalResp;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/CallingListHistoricalDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/CallingListHistoricalDal.java
index 23e1d64f..97b8fc3e 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/CallingListHistoricalDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/CallingListHistoricalDal.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.callinglist;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.dal.callinglist.model.CallingListHistorical;
import com.pudonghot.yo.dal.callinglist.request.ReqCallingListRevert;
import com.pudonghot.yo.dal.callinglist.response.CallingListHistoricalSummaryDalResp;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/CallingListPreparedDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/CallingListPreparedDal.java
index e062bb92..6a42211a 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/CallingListPreparedDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/CallingListPreparedDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.callinglist;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.dal.callinglist.model.CallingListPrepared;
import com.pudonghot.yo.dal.callinglist.request.ReqCallingListRevert;
import com.pudonghot.yo.dal.callinglist.response.CallingListPreparedSummaryDalResp;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/impl/CallingListDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/impl/CallingListDalImpl.java
index 3f5f10d5..a5015832 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/impl/CallingListDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/impl/CallingListDalImpl.java
@@ -5,11 +5,11 @@ import java.util.Date;
import java.util.List;
import java.util.HashMap;
-import me.chyxion.tigon.dal.annotation.FilterCol;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import com.pudonghot.yo.basic.model.DailyTime;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.callinglist.CallingListDal;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/impl/CallingListHistoricalDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/impl/CallingListHistoricalDalImpl.java
index 0803e3f6..1fad9576 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/impl/CallingListHistoricalDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/impl/CallingListHistoricalDalImpl.java
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.callinglist.model.CallingListHistorical;
import com.pudonghot.yo.dal.callinglist.mapper.CallingListHistoricalMapper;
import com.pudonghot.yo.dal.callinglist.CallingListHistoricalDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/impl/CallingListPreparedDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/impl/CallingListPreparedDalImpl.java
index bb241894..277a48da 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/impl/CallingListPreparedDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/impl/CallingListPreparedDalImpl.java
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.callinglist.model.CallingListPrepared;
import com.pudonghot.yo.dal.callinglist.mapper.CallingListPreparedMapper;
import com.pudonghot.yo.dal.callinglist.CallingListPreparedDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/CampaignDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/CampaignDal.java
index 13997a4e..07c1c530 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/CampaignDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/CampaignDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.campaign;
import com.pudonghot.yo.dal.campaign.model.Campaign;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.List;
import java.util.function.Consumer;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/CampaignTrunkStrategyDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/CampaignTrunkStrategyDal.java
index 25d963ba..1e2f916d 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/CampaignTrunkStrategyDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/CampaignTrunkStrategyDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.campaign;
import com.pudonghot.yo.dal.campaign.model.CampaignTrunkStrategy;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.Collection;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/impl/CampaignDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/impl/CampaignDalImpl.java
index 5b870a7b..97ba58c5 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/impl/CampaignDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/impl/CampaignDalImpl.java
@@ -2,17 +2,17 @@ package com.pudonghot.yo.dal.campaign.impl;
import com.pudonghot.yo.basic.model.campaign.enumeration.CampaignStatusEnum;
import com.pudonghot.yo.dal.common.TaggableDalImpl;
-import me.chyxion.tigon.dal.annotation.FilterCol;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.annotation.TenantResource;
-import me.chyxion.tigon.dal.request.FindDalReq;
-import me.chyxion.tigon.dal.request.ListDalReq;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.request.FindDalReq;
+import com.pudonghot.tigon.dal.request.ListDalReq;
import com.pudonghot.tigon.mybatis.Search;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.campaign.model.Campaign;
import com.pudonghot.yo.dal.campaign.mapper.CampaignMapper;
import com.pudonghot.yo.dal.campaign.CampaignDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import java.util.List;
import java.util.function.Consumer;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/impl/CampaignTrunkStrategyDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/impl/CampaignTrunkStrategyDalImpl.java
index d50881b3..6ba6e807 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/impl/CampaignTrunkStrategyDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/impl/CampaignTrunkStrategyDalImpl.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.dal.campaign.impl;
import java.util.List;
import java.util.Collection;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.campaign.CampaignTrunkStrategyDal;
import com.pudonghot.yo.dal.campaign.model.CampaignTrunkStrategy;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/CallDetailRecordDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/CallDetailRecordDal.java
index 1bef6f70..9f80b6a6 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/CallDetailRecordDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/CallDetailRecordDal.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.dal.cdr;
import java.util.Date;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.dal.cdr.model.CallDetailRecord;
import com.pudonghot.yo.dal.callinglist.response.CallDetailReportDalResp;
import com.pudonghot.yo.dal.cdr.request.CallDetailRecordAccountReportDalReq;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/CallRecordingDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/CallRecordingDal.java
index dfd82801..828e1957 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/CallRecordingDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/CallRecordingDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.cdr;
import com.pudonghot.yo.dal.cdr.model.CallRecording;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
/**
* 通话录音
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/CallSatisfactionDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/CallSatisfactionDal.java
index 480895fc..8c9fea92 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/CallSatisfactionDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/CallSatisfactionDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.cdr;
import com.pudonghot.yo.dal.cdr.model.CallSatisfaction;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
/**
* 电话满意度
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/impl/CallDetailRecordDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/impl/CallDetailRecordDalImpl.java
index 9c95e983..3fcb83dc 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/impl/CallDetailRecordDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/impl/CallDetailRecordDalImpl.java
@@ -8,13 +8,13 @@ import java.util.Date;
import lombok.ToString;
import java.io.Serializable;
import com.pudonghot.tigon.mybatis.Search;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import org.apache.commons.lang3.StringUtils;
-import me.chyxion.tigon.kit.bean.BeanService;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.request.ListDalReq;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.request.ListDalReq;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.cdr.CallDetailRecordDal;
import com.pudonghot.yo.dal.cdr.model.CallDetailRecord;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/impl/CallRecordingDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/impl/CallRecordingDalImpl.java
index 01453ebd..a375e6a1 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/impl/CallRecordingDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/impl/CallRecordingDalImpl.java
@@ -5,7 +5,7 @@ import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.cdr.model.CallRecording;
import com.pudonghot.yo.dal.cdr.mapper.CallRecordingMapper;
import com.pudonghot.yo.dal.cdr.CallRecordingDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
/**
* 通话录音
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/impl/CallSatisfactionDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/impl/CallSatisfactionDalImpl.java
index 9a36ebe4..a70488bb 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/impl/CallSatisfactionDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/impl/CallSatisfactionDalImpl.java
@@ -4,7 +4,7 @@ import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.cdr.model.CallSatisfaction;
import com.pudonghot.yo.dal.cdr.mapper.CallSatisfactionMapper;
import com.pudonghot.yo.dal.cdr.CallSatisfactionDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
/**
* 电话满意度
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/common/TaggableDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/common/TaggableDalImpl.java
index 6c27be67..a1b8a349 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/common/TaggableDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/common/TaggableDalImpl.java
@@ -2,9 +2,9 @@ package com.pudonghot.yo.dal.common;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.BaseMapper;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.request.FindDalReq;
-import me.chyxion.tigon.dal.request.ListDalReq;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.request.FindDalReq;
+import com.pudonghot.tigon.dal.request.ListDalReq;
import com.pudonghot.yo.dal.tag.mapper.TagMapper;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/gateway/GatewayDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/gateway/GatewayDal.java
index a1d50b49..30443a14 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/gateway/GatewayDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/gateway/GatewayDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.gateway;
import com.pudonghot.yo.dal.gateway.model.Gateway;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/gateway/impl/GatewayDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/gateway/impl/GatewayDalImpl.java
index d8dd8ece..818f7dfd 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/gateway/impl/GatewayDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/gateway/impl/GatewayDalImpl.java
@@ -2,13 +2,13 @@ package com.pudonghot.yo.dal.gateway.impl;
import java.util.List;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.gateway.model.Gateway;
import com.pudonghot.yo.dal.gateway.mapper.GatewayMapper;
import com.pudonghot.yo.dal.gateway.GatewayDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
/**
* 网关
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/IvrEntryDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/IvrEntryDal.java
index e3140bf6..d2f4861a 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/IvrEntryDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/IvrEntryDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.ivr;
import com.pudonghot.yo.dal.ivr.model.IvrEntry;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/IvrMenuDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/IvrMenuDal.java
index 24fe14c1..01f0bcdc 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/IvrMenuDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/IvrMenuDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.ivr;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.dal.ivr.model.IvrMenu;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/SoundDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/SoundDal.java
index 052ed826..9e1e0826 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/SoundDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/SoundDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.ivr;
import com.pudonghot.yo.dal.ivr.model.Sound;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
/**
* 声音
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/impl/IvrEntryDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/impl/IvrEntryDalImpl.java
index d10b1dcd..9ba69db3 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/impl/IvrEntryDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/impl/IvrEntryDalImpl.java
@@ -2,14 +2,14 @@ package com.pudonghot.yo.dal.ivr.impl;
import java.util.List;
-import me.chyxion.tigon.dal.request.ListDalReq;
+import com.pudonghot.tigon.dal.request.ListDalReq;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.ivr.IvrEntryDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import com.pudonghot.yo.dal.ivr.model.IvrEntry;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.dal.ivr.mapper.IvrEntryMapper;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/impl/IvrMenuDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/impl/IvrMenuDalImpl.java
index 2495c426..707f9653 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/impl/IvrMenuDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/impl/IvrMenuDalImpl.java
@@ -3,13 +3,13 @@ package com.pudonghot.yo.dal.ivr.impl;
import java.util.List;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.ivr.IvrMenuDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import com.pudonghot.yo.dal.ivr.model.IvrMenu;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.dal.ivr.mapper.IvrMenuMapper;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
/**
* IVR菜单
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/impl/SoundDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/impl/SoundDalImpl.java
index b3369d67..6b8c3aea 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/impl/SoundDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/impl/SoundDalImpl.java
@@ -4,7 +4,7 @@ import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.ivr.model.Sound;
import com.pudonghot.yo.dal.ivr.mapper.SoundMapper;
import com.pudonghot.yo.dal.ivr.SoundDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
/**
* 声音
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/AreaCodeDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/AreaCodeDal.java
index ae96a04b..560ce934 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/AreaCodeDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/AreaCodeDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.misc;
import com.pudonghot.yo.dal.misc.model.AreaCode;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/SequenceDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/SequenceDal.java
index aa89d94b..195c68d1 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/SequenceDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/SequenceDal.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.misc;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.misc.model.Sequence;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/TelecomVendorDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/TelecomVendorDal.java
index b95b52da..226407f2 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/TelecomVendorDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/TelecomVendorDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.misc;
import com.pudonghot.yo.dal.misc.model.TelecomVendor;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/impl/AreaCodeDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/impl/AreaCodeDalImpl.java
index 7d8caad8..29249949 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/impl/AreaCodeDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/impl/AreaCodeDalImpl.java
@@ -3,10 +3,10 @@ package com.pudonghot.yo.dal.misc.impl;
import java.util.List;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.misc.AreaCodeDal;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.misc.model.AreaCode;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.dal.common.TaggableDalImpl;
import com.pudonghot.yo.dal.misc.mapper.AreaCodeMapper;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/impl/SequenceDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/impl/SequenceDalImpl.java
index 8de0a0ce..cba6f078 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/impl/SequenceDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/impl/SequenceDalImpl.java
@@ -2,12 +2,12 @@ package com.pudonghot.yo.dal.misc.impl;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.misc.SequenceDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.misc.model.Sequence;
-import me.chyxion.tigon.dal.annotation.FilterCol;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
import com.pudonghot.yo.dal.misc.mapper.SequenceMapper;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/impl/TelecomVendorDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/impl/TelecomVendorDalImpl.java
index e38325f5..0240342e 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/impl/TelecomVendorDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/impl/TelecomVendorDalImpl.java
@@ -2,10 +2,10 @@ package com.pudonghot.yo.dal.misc.impl;
import java.util.List;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.dal.misc.TelecomVendorDal;
import com.pudonghot.yo.dal.misc.model.TelecomVendor;
import com.pudonghot.yo.dal.misc.mapper.TelecomVendorMapper;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/mapper/SequenceMapper.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/mapper/SequenceMapper.java
index 542789c5..a9bad164 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/mapper/SequenceMapper.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/misc/mapper/SequenceMapper.java
@@ -4,8 +4,8 @@ import com.pudonghot.yo.dal.misc.model.Sequence;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.BaseMapper;
import org.apache.ibatis.annotations.Param;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/PhoneAliasDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/PhoneAliasDal.java
index 24b01ce2..5ad4a6a7 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/PhoneAliasDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/PhoneAliasDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.phone;
import com.pudonghot.yo.dal.phone.model.PhoneAlias;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
/**
* 电话号码别名
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/PhoneBlacklistDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/PhoneBlacklistDal.java
index 64967174..30933bee 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/PhoneBlacklistDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/PhoneBlacklistDal.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.phone;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.dal.phone.model.PhoneBlacklist;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/PhoneGreylistDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/PhoneGreylistDal.java
index 9a12fbae..ed994cc7 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/PhoneGreylistDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/PhoneGreylistDal.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.phone;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.dal.phone.model.PhoneGreylist;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/PhoneWhitelistDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/PhoneWhitelistDal.java
index 02d005ac..5cef5d39 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/PhoneWhitelistDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/PhoneWhitelistDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.phone;
import com.pudonghot.yo.dal.phone.model.PhoneWhitelist;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
/**
* 电话白名单
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/impl/PhoneAliasDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/impl/PhoneAliasDalImpl.java
index 43aa3f41..46aaaf35 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/impl/PhoneAliasDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/impl/PhoneAliasDalImpl.java
@@ -1,9 +1,9 @@
package com.pudonghot.yo.dal.phone.impl;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.annotation.FilterCol;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.phone.PhoneAliasDal;
import com.pudonghot.yo.dal.phone.model.PhoneList;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/impl/PhoneBlacklistDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/impl/PhoneBlacklistDalImpl.java
index ff907041..9afda12a 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/impl/PhoneBlacklistDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/impl/PhoneBlacklistDalImpl.java
@@ -1,9 +1,9 @@
package com.pudonghot.yo.dal.phone.impl;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.phone.model.PhoneList;
import com.pudonghot.yo.dal.phone.PhoneBlacklistDal;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/impl/PhoneGreylistDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/impl/PhoneGreylistDalImpl.java
index d9865791..c98bbd48 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/impl/PhoneGreylistDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/impl/PhoneGreylistDalImpl.java
@@ -1,14 +1,14 @@
package com.pudonghot.yo.dal.phone.impl;
import com.pudonghot.yo.dal.phone.model.PhoneList;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
import com.pudonghot.tigon.mybatis.Search;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.phone.model.PhoneGreylist;
import com.pudonghot.yo.dal.phone.mapper.PhoneGreylistMapper;
import com.pudonghot.yo.dal.phone.PhoneGreylistDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
/**
* 电话灰名单
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/impl/PhoneWhitelistDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/impl/PhoneWhitelistDalImpl.java
index f52eecf7..75d8b751 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/impl/PhoneWhitelistDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/phone/impl/PhoneWhitelistDalImpl.java
@@ -2,14 +2,14 @@ package com.pudonghot.yo.dal.phone.impl;
import com.pudonghot.yo.dal.phone.model.PhoneGreylist;
import com.pudonghot.yo.dal.phone.model.PhoneList;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
import com.pudonghot.tigon.mybatis.Search;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.phone.model.PhoneWhitelist;
import com.pudonghot.yo.dal.phone.mapper.PhoneWhitelistMapper;
import com.pudonghot.yo.dal.phone.PhoneWhitelistDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
/**
* 电话白名单
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/queue/QueueAgentDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/queue/QueueAgentDal.java
index 43073309..6cdd2ac6 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/queue/QueueAgentDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/queue/QueueAgentDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.queue;
import com.pudonghot.yo.dal.queue.model.QueueAgent;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.Collection;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/queue/QueueDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/queue/QueueDal.java
index 0896d87a..1689efcd 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/queue/QueueDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/queue/QueueDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.queue;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.dal.queue.model.Queue;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/queue/impl/QueueAgentDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/queue/impl/QueueAgentDalImpl.java
index 9c59d554..196a0e27 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/queue/impl/QueueAgentDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/queue/impl/QueueAgentDalImpl.java
@@ -4,7 +4,7 @@ import java.util.List;
import java.util.Collection;
import lombok.extern.slf4j.Slf4j;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.queue.QueueAgentDal;
import com.pudonghot.yo.dal.queue.model.QueueAgent;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/queue/impl/QueueDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/queue/impl/QueueDalImpl.java
index 158c895f..51d9c722 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/queue/impl/QueueDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/queue/impl/QueueDalImpl.java
@@ -3,13 +3,13 @@ package com.pudonghot.yo.dal.queue.impl;
import java.util.List;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.queue.QueueDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import com.pudonghot.yo.dal.queue.model.Queue;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.queue.mapper.QueueMapper;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
/**
* 队列
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/tag/ObjectTagDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/tag/ObjectTagDal.java
index 32d6545b..afcab382 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/tag/ObjectTagDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/tag/ObjectTagDal.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.dal.tag;
import java.util.List;
import java.util.Collection;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.dal.tag.model.ObjectTag;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/tag/TagDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/tag/TagDal.java
index 439608a8..9166c4f8 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/tag/TagDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/tag/TagDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.tag;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.dal.tag.model.Tag;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/tag/impl/ObjectTagDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/tag/impl/ObjectTagDalImpl.java
index 3ffc80e1..c75f10e3 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/tag/impl/ObjectTagDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/tag/impl/ObjectTagDalImpl.java
@@ -5,7 +5,7 @@ import java.util.Collection;
import lombok.extern.slf4j.Slf4j;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.tag.ObjectTagDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.tag.model.ObjectTag;
import com.pudonghot.yo.dal.tag.mapper.ObjectTagMapper;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/tag/impl/TagDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/tag/impl/TagDalImpl.java
index adc32826..4ecd6e86 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/tag/impl/TagDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/tag/impl/TagDalImpl.java
@@ -10,13 +10,13 @@ import java.io.Serializable;
import com.pudonghot.yo.dal.tag.TagDal;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.tag.model.Tag;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.request.ListDalReq;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.request.ListDalReq;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.dal.tag.mapper.TagMapper;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
/**
* 标签
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/tenant/TenantDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/tenant/TenantDal.java
index 93fa82af..2206760a 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/tenant/TenantDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/tenant/TenantDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.tenant;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.dal.tenant.model.Tenant;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/tenant/impl/TenantDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/tenant/impl/TenantDalImpl.java
index d66e33cb..0b3d4958 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/tenant/impl/TenantDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/tenant/impl/TenantDalImpl.java
@@ -3,11 +3,11 @@ package com.pudonghot.yo.dal.tenant.impl;
import java.util.List;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.tenant.TenantDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.tenant.model.Tenant;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.dal.tenant.mapper.TenantMapper;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkAttrDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkAttrDal.java
index 8fee74a7..7beab268 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkAttrDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkAttrDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.trunk;
import com.pudonghot.yo.dal.trunk.model.TrunkAttr;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkDal.java
index c594834d..3f1f9aeb 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkDal.java
@@ -1,11 +1,11 @@
package com.pudonghot.yo.dal.trunk;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.dal.trunk.model.Trunk;
-import me.chyxion.tigon.dal.annotation.FilterCol;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
/**
* Trunk
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkProhibitedAreaCodeDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkProhibitedAreaCodeDal.java
index 8651c568..86c35ac2 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkProhibitedAreaCodeDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkProhibitedAreaCodeDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.trunk;
import com.pudonghot.yo.dal.trunk.model.TrunkProhibitedAreaCode;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
/**
* 中继禁呼区
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkStrategyDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkStrategyDal.java
index fe8f81b7..9141802c 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkStrategyDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkStrategyDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.trunk;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.dal.trunk.model.TrunkStrategy;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkStrategyTrunkDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkStrategyTrunkDal.java
index 96877956..2f2e1413 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkStrategyTrunkDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkStrategyTrunkDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.trunk;
import com.pudonghot.yo.dal.trunk.model.TrunkStrategyTrunk;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.Collection;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkTrunkAttrDal.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkTrunkAttrDal.java
index 78ff146b..ae939d01 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkTrunkAttrDal.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/TrunkTrunkAttrDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.trunk;
import com.pudonghot.yo.dal.trunk.model.TrunkTrunkAttr;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.Collection;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkAttrDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkAttrDalImpl.java
index c986963f..000e22a9 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkAttrDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkAttrDalImpl.java
@@ -2,13 +2,13 @@ package com.pudonghot.yo.dal.trunk.impl;
import java.util.List;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import com.pudonghot.yo.dal.trunk.TrunkAttrDal;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.dal.trunk.model.TrunkAttr;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
import com.pudonghot.yo.dal.trunk.mapper.TrunkAttrMapper;
/**
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkDalImpl.java
index e9d32f00..481f38bf 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkDalImpl.java
@@ -4,14 +4,14 @@ import java.util.List;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.trunk.TrunkDal;
import com.pudonghot.yo.dal.trunk.model.Trunk;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.request.FindDalReq;
-import me.chyxion.tigon.dal.request.ListDalReq;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.request.FindDalReq;
+import com.pudonghot.tigon.dal.request.ListDalReq;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.dal.common.TaggableDalImpl;
import com.pudonghot.yo.dal.trunk.mapper.TrunkMapper;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
/**
* Trunk
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkProhibitedAreaCodeDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkProhibitedAreaCodeDalImpl.java
index ff458dbe..eedd7ba3 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkProhibitedAreaCodeDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkProhibitedAreaCodeDalImpl.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.dal.trunk.impl;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.dal.annotation.FilterCol;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
import com.pudonghot.yo.dal.trunk.TrunkProhibitedAreaCodeDal;
import com.pudonghot.yo.dal.trunk.model.TrunkProhibitedAreaCode;
import com.pudonghot.yo.dal.trunk.mapper.TrunkProhibitedAreaCodeMapper;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkStrategyDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkStrategyDalImpl.java
index 2ee95302..e5e9c73c 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkStrategyDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkStrategyDalImpl.java
@@ -2,12 +2,12 @@ package com.pudonghot.yo.dal.trunk.impl;
import java.util.List;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.dal.trunk.TrunkStrategyDal;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
import com.pudonghot.yo.dal.trunk.model.TrunkStrategy;
import com.pudonghot.yo.dal.trunk.mapper.TrunkStrategyMapper;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkStrategyTrunkDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkStrategyTrunkDalImpl.java
index de6552c5..794fbd8a 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkStrategyTrunkDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkStrategyTrunkDalImpl.java
@@ -5,7 +5,7 @@ import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.trunk.model.TrunkStrategyTrunk;
import com.pudonghot.yo.dal.trunk.mapper.TrunkStrategyTrunkMapper;
import com.pudonghot.yo.dal.trunk.TrunkStrategyTrunkDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import java.util.Collection;
import java.util.List;
diff --git a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkTrunkAttrDalImpl.java b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkTrunkAttrDalImpl.java
index 431ccf6f..176a5a14 100644
--- a/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkTrunkAttrDalImpl.java
+++ b/lib/dal/src/main/java/com/pudonghot/yo/dal/trunk/impl/TrunkTrunkAttrDalImpl.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.dal.trunk.impl;
import java.util.List;
import java.util.Collection;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.trunk.TrunkTrunkAttrDal;
import com.pudonghot.yo.dal.trunk.model.TrunkTrunkAttr;
diff --git a/lib/dal/src/test/java/com/pudonghot/yo/dal/stub/MetaCategoryDal.java b/lib/dal/src/test/java/com/pudonghot/yo/dal/stub/MetaCategoryDal.java
index 8f207bb0..489105ea 100644
--- a/lib/dal/src/test/java/com/pudonghot/yo/dal/stub/MetaCategoryDal.java
+++ b/lib/dal/src/test/java/com/pudonghot/yo/dal/stub/MetaCategoryDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.stub;
import com.pudonghot.yo.dal.stub.model.MetaCategoryDO;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
/**
* 元数据类别
diff --git a/lib/dal/src/test/java/com/pudonghot/yo/dal/stub/SeqGenDal.java b/lib/dal/src/test/java/com/pudonghot/yo/dal/stub/SeqGenDal.java
index 55a1a01e..94f1e70f 100644
--- a/lib/dal/src/test/java/com/pudonghot/yo/dal/stub/SeqGenDal.java
+++ b/lib/dal/src/test/java/com/pudonghot/yo/dal/stub/SeqGenDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.stub;
import com.pudonghot.yo.dal.stub.model.SeqGenDO;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
/**
* 序号生成器
diff --git a/lib/dal/src/test/java/com/pudonghot/yo/dal/stub/impl/MetaCategoryDalImpl.java b/lib/dal/src/test/java/com/pudonghot/yo/dal/stub/impl/MetaCategoryDalImpl.java
index 96165d73..25335278 100644
--- a/lib/dal/src/test/java/com/pudonghot/yo/dal/stub/impl/MetaCategoryDalImpl.java
+++ b/lib/dal/src/test/java/com/pudonghot/yo/dal/stub/impl/MetaCategoryDalImpl.java
@@ -4,7 +4,7 @@ import com.pudonghot.yo.dal.stub.mapper.MetaCategoryMapper;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.stub.model.MetaCategoryDO;
import com.pudonghot.yo.dal.stub.MetaCategoryDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
/**
* 元数据类别
diff --git a/lib/dal/src/test/java/com/pudonghot/yo/dal/stub/impl/SeqGenDalImpl.java b/lib/dal/src/test/java/com/pudonghot/yo/dal/stub/impl/SeqGenDalImpl.java
index 63d66960..a8064b64 100644
--- a/lib/dal/src/test/java/com/pudonghot/yo/dal/stub/impl/SeqGenDalImpl.java
+++ b/lib/dal/src/test/java/com/pudonghot/yo/dal/stub/impl/SeqGenDalImpl.java
@@ -4,7 +4,7 @@ import com.pudonghot.yo.dal.stub.mapper.SeqGenMapper;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.stub.model.SeqGenDO;
import com.pudonghot.yo.dal.stub.SeqGenDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
/**
* 序号生成器
diff --git a/lib/fs-dal/pom.xml b/lib/fs-dal/pom.xml
index cdde8406..4630e9e9 100644
--- a/lib/fs-dal/pom.xml
+++ b/lib/fs-dal/pom.xml
@@ -17,8 +17,8 @@
- javax.validation
- validation-api
+ jakarta.validation
+ jakarta.validation-api
org.springframework
@@ -40,7 +40,7 @@
tigon-mybatis
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-kit
diff --git a/lib/fs-dal/src/main/java/com/pudonghot/yo/fsdal/BaseFsDal.java b/lib/fs-dal/src/main/java/com/pudonghot/yo/fsdal/BaseFsDal.java
index 9f8c53bd..947ece89 100644
--- a/lib/fs-dal/src/main/java/com/pudonghot/yo/fsdal/BaseFsDal.java
+++ b/lib/fs-dal/src/main/java/com/pudonghot/yo/fsdal/BaseFsDal.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.fsdal;
import java.util.List;
import java.util.function.Consumer;
import com.pudonghot.tigon.mybatis.Search;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
import org.springframework.validation.annotation.Validated;
/**
diff --git a/lib/fs-dal/src/main/java/com/pudonghot/yo/fsdal/ChannelDal.java b/lib/fs-dal/src/main/java/com/pudonghot/yo/fsdal/ChannelDal.java
index 532b108c..343eb7e0 100644
--- a/lib/fs-dal/src/main/java/com/pudonghot/yo/fsdal/ChannelDal.java
+++ b/lib/fs-dal/src/main/java/com/pudonghot/yo/fsdal/ChannelDal.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.fsdal;
import java.util.List;
import com.pudonghot.yo.fsdal.model.Channel;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/lib/fs-dal/src/main/java/com/pudonghot/yo/fsdal/impl/BaseFsDalImpl.java b/lib/fs-dal/src/main/java/com/pudonghot/yo/fsdal/impl/BaseFsDalImpl.java
index aa3ea976..75cc42ae 100644
--- a/lib/fs-dal/src/main/java/com/pudonghot/yo/fsdal/impl/BaseFsDalImpl.java
+++ b/lib/fs-dal/src/main/java/com/pudonghot/yo/fsdal/impl/BaseFsDalImpl.java
@@ -9,7 +9,7 @@ import java.util.function.Consumer;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.fsdal.BaseFsDal;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import com.pudonghot.tigon.mybatis.BaseQueryMapper;
import org.springframework.core.GenericTypeResolver;
import org.springframework.core.annotation.AnnotationUtils;
diff --git a/lib/fsagent-api/src/main/java/com/pudonghot/yo/fsagent/api/request/AgentDialServReq.java b/lib/fsagent-api/src/main/java/com/pudonghot/yo/fsagent/api/request/AgentDialServReq.java
index 1b4eb5a9..ecf458cf 100644
--- a/lib/fsagent-api/src/main/java/com/pudonghot/yo/fsagent/api/request/AgentDialServReq.java
+++ b/lib/fsagent-api/src/main/java/com/pudonghot/yo/fsagent/api/request/AgentDialServReq.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.fsagent.api.request;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/lib/fsagent-api/src/main/java/com/pudonghot/yo/fsagent/api/request/BaseDialServReq.java b/lib/fsagent-api/src/main/java/com/pudonghot/yo/fsagent/api/request/BaseDialServReq.java
index 354299ae..706d02f2 100644
--- a/lib/fsagent-api/src/main/java/com/pudonghot/yo/fsagent/api/request/BaseDialServReq.java
+++ b/lib/fsagent-api/src/main/java/com/pudonghot/yo/fsagent/api/request/BaseDialServReq.java
@@ -4,7 +4,7 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import com.pudonghot.yo.basic.model.enumeration.DialTypeEnum;
/**
diff --git a/lib/fsagent-api/src/main/java/com/pudonghot/yo/fsagent/api/request/CommonDialServReq.java b/lib/fsagent-api/src/main/java/com/pudonghot/yo/fsagent/api/request/CommonDialServReq.java
index 1c6a9155..3972ed9a 100644
--- a/lib/fsagent-api/src/main/java/com/pudonghot/yo/fsagent/api/request/CommonDialServReq.java
+++ b/lib/fsagent-api/src/main/java/com/pudonghot/yo/fsagent/api/request/CommonDialServReq.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.fsagent.api.request;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
/**
* @author Donghuang
diff --git a/lib/http-client/http-client-apache/pom.xml b/lib/http-client/http-client-apache/pom.xml
index c975c48a..c709e0b2 100644
--- a/lib/http-client/http-client-apache/pom.xml
+++ b/lib/http-client/http-client-apache/pom.xml
@@ -22,6 +22,7 @@
org.apache.httpcomponents
httpmime
+ 4.5.14
org.apache.commons
diff --git a/lib/http-client/http-client-api/pom.xml b/lib/http-client/http-client-api/pom.xml
index b01cbd1a..1387387f 100644
--- a/lib/http-client/http-client-api/pom.xml
+++ b/lib/http-client/http-client-api/pom.xml
@@ -32,7 +32,7 @@
hibernate-validator
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-kit
diff --git a/lib/http-client/http-client-api/src/main/java/com/pudonghot/yo/common/httpclient/HttpClient.java b/lib/http-client/http-client-api/src/main/java/com/pudonghot/yo/common/httpclient/HttpClient.java
index d3334570..28583fca 100644
--- a/lib/http-client/http-client-api/src/main/java/com/pudonghot/yo/common/httpclient/HttpClient.java
+++ b/lib/http-client/http-client-api/src/main/java/com/pudonghot/yo/common/httpclient/HttpClient.java
@@ -2,8 +2,8 @@ package com.pudonghot.yo.common.httpclient;
import java.util.Map;
import java.util.List;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import org.springframework.validation.annotation.Validated;
/**
diff --git a/lib/http-client/http-client-api/src/main/java/com/pudonghot/yo/common/httpclient/impl/AbstractHttpClient.java b/lib/http-client/http-client-api/src/main/java/com/pudonghot/yo/common/httpclient/impl/AbstractHttpClient.java
index 95163b6b..87added9 100644
--- a/lib/http-client/http-client-api/src/main/java/com/pudonghot/yo/common/httpclient/impl/AbstractHttpClient.java
+++ b/lib/http-client/http-client-api/src/main/java/com/pudonghot/yo/common/httpclient/impl/AbstractHttpClient.java
@@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j;
import java.util.function.BiFunction;
import org.springframework.util.Assert;
import com.pudonghot.yo.common.httpclient.*;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/lib/service-common/pom.xml b/lib/service-common/pom.xml
index 0ba2bbb4..4fc50585 100644
--- a/lib/service-common/pom.xml
+++ b/lib/service-common/pom.xml
@@ -20,7 +20,7 @@
slf4j-api
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-common
diff --git a/lib/service-impl/pom.xml b/lib/service-impl/pom.xml
index a0c7b923..e1f3e693 100644
--- a/lib/service-impl/pom.xml
+++ b/lib/service-impl/pom.xml
@@ -25,11 +25,11 @@
yo-fs-dal
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-kit
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-service
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/AgentGroupService.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/AgentGroupService.java
index 0a150666..a467348d 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/AgentGroupService.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/AgentGroupService.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.service;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.service.response.AgentGroupServResp;
import com.pudonghot.yo.service.request.create.AgentGroupCreateServReq;
import com.pudonghot.yo.service.request.update.AgentGroupUpdateServReq;
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/AgentService.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/AgentService.java
index 1acce898..d8a42046 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/AgentService.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/AgentService.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.service;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.service.response.AgentServResp;
import com.pudonghot.yo.service.request.create.AgentCreateServReq;
import com.pudonghot.yo.service.request.update.AgentUpdateServReq;
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/AgentStatusService.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/AgentStatusService.java
index a0f0d936..f696666d 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/AgentStatusService.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/AgentStatusService.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.service;
import java.util.function.Consumer;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.service.response.AgentServResp;
import com.pudonghot.yo.service.response.AgentStatusServResp;
import com.pudonghot.yo.service.request.create.AgentStatusCreateServReq;
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/TenantService.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/TenantService.java
index 21a1a237..d4e1510c 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/TenantService.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/TenantService.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.service;
import java.util.List;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.service.response.TenantServResp;
import com.pudonghot.yo.service.request.create.TenantCreateServReq;
import com.pudonghot.yo.service.request.update.TenantUpdateServReq;
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/AgentGroupServiceImpl.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/AgentGroupServiceImpl.java
index 07d2d44d..43b7d010 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/AgentGroupServiceImpl.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/AgentGroupServiceImpl.java
@@ -4,7 +4,7 @@ import lombok.extern.slf4j.Slf4j;
import com.pudonghot.yo.dal.agent.AgentGroupDal;
import com.pudonghot.yo.dal.agent.model.AgentGroup;
import com.pudonghot.yo.service.AgentGroupService;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.service.response.AgentGroupServResp;
import com.pudonghot.yo.service.request.create.AgentGroupCreateServReq;
import com.pudonghot.yo.service.request.update.AgentGroupUpdateServReq;
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/AgentServiceImpl.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/AgentServiceImpl.java
index 43607de1..d2effb62 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/AgentServiceImpl.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/AgentServiceImpl.java
@@ -5,9 +5,9 @@ import lombok.extern.slf4j.Slf4j;
import java.util.function.Function;
import java.util.concurrent.locks.Lock;
import com.pudonghot.yo.dal.agent.AgentDal;
-import me.chyxion.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
import com.pudonghot.yo.dal.agent.model.Agent;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import org.apache.commons.lang3.StringUtils;
import com.pudonghot.yo.service.AgentService;
import java.util.concurrent.locks.ReentrantLock;
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/AgentStatusServiceImpl.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/AgentStatusServiceImpl.java
index ab4c7d73..e5b3259e 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/AgentStatusServiceImpl.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/AgentStatusServiceImpl.java
@@ -10,11 +10,11 @@ import com.pudonghot.yo.dal.tenant.TenantDal;
import com.pudonghot.yo.service.AgentService;
import com.pudonghot.yo.fsdal.RegistrationDal;
import com.pudonghot.yo.service.ChannelService;
-import me.chyxion.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
import com.pudonghot.yo.dal.agent.AgentStatusDal;
import com.pudonghot.yo.dal.agent.model.AgentStatus;
import com.pudonghot.yo.service.AgentStatusService;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.service.response.AgentServResp;
import com.pudonghot.yo.basic.model.exception.ErrorCode;
import com.pudonghot.yo.basic.model.exception.AssertUtils;
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/CallDataServiceImpl.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/CallDataServiceImpl.java
index 97c4987e..ef71d1dc 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/CallDataServiceImpl.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/CallDataServiceImpl.java
@@ -7,7 +7,7 @@ import org.redisson.api.RMapCache;
import java.util.concurrent.TimeUnit;
import org.redisson.api.RedissonClient;
import org.apache.commons.lang3.StringUtils;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.redisson.client.codec.StringCodec;
import org.redisson.client.codec.IntegerCodec;
import com.pudonghot.yo.service.CallDataService;
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/ChannelServiceImpl.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/ChannelServiceImpl.java
index 667dc157..ec1c2f03 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/ChannelServiceImpl.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/ChannelServiceImpl.java
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
import java.util.stream.Collectors;
import com.pudonghot.yo.fsdal.ChannelDal;
import org.apache.commons.lang3.tuple.Pair;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import com.pudonghot.yo.service.TenantService;
import com.pudonghot.yo.service.ChannelService;
import com.pudonghot.yo.service.response.ChannelServResp;
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/TenantServiceImpl.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/TenantServiceImpl.java
index ce9857af..d786a990 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/TenantServiceImpl.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/impl/TenantServiceImpl.java
@@ -5,10 +5,10 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import com.pudonghot.yo.dal.tenant.TenantDal;
import com.pudonghot.yo.dal.tenant.model.Tenant;
-import me.chyxion.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
import com.pudonghot.yo.service.TenantService;
import org.apache.commons.lang3.RandomStringUtils;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.service.response.TenantServResp;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/BaseServReq.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/BaseServReq.java
index e734b157..4cb0ea74 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/BaseServReq.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/BaseServReq.java
@@ -2,8 +2,8 @@ package com.pudonghot.yo.service.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/AgentCreateServReq.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/AgentCreateServReq.java
index dc3ff692..69bf7dda 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/AgentCreateServReq.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/AgentCreateServReq.java
@@ -2,9 +2,9 @@ package com.pudonghot.yo.service.request.create;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
import org.hibernate.validator.constraints.Range;
import com.pudonghot.yo.service.request.TaggableServReqApi;
import com.pudonghot.yo.basic.model.enumeration.AgentTypeEnum;
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/AgentGroupCreateServReq.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/AgentGroupCreateServReq.java
index cbc63c7b..607dde58 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/AgentGroupCreateServReq.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/AgentGroupCreateServReq.java
@@ -2,10 +2,10 @@ package com.pudonghot.yo.service.request.create;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.basic.model.enumeration.PrivacyLevelEnum;
import com.pudonghot.yo.service.request.TaggableServReqApi;
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/AgentStatusCreateServReq.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/AgentStatusCreateServReq.java
index 7030dbc9..6cc4bf2f 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/AgentStatusCreateServReq.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/AgentStatusCreateServReq.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.service.request.create;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/BaseCreateServReq.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/BaseCreateServReq.java
index c0ecb41f..86338971 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/BaseCreateServReq.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/BaseCreateServReq.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.service.request.create;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.service.request.BaseServReq;
/**
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/TenantCreateServReq.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/TenantCreateServReq.java
index ffbcea67..952b77f3 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/TenantCreateServReq.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/create/TenantCreateServReq.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.service.request.create;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/update/AgentGroupUpdateServReq.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/update/AgentGroupUpdateServReq.java
index 0dd327e2..86e467c8 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/update/AgentGroupUpdateServReq.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/update/AgentGroupUpdateServReq.java
@@ -4,10 +4,10 @@ import com.pudonghot.yo.basic.model.enumeration.PrivacyLevelEnum;
import com.pudonghot.yo.service.request.TaggableServReqApi;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
/**
* @author Donghuang
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/update/AgentUpdateServReq.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/update/AgentUpdateServReq.java
index b4213417..c0b19540 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/update/AgentUpdateServReq.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/update/AgentUpdateServReq.java
@@ -2,9 +2,9 @@ package com.pudonghot.yo.service.request.update;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
import org.hibernate.validator.constraints.Range;
import com.pudonghot.yo.service.request.TaggableServReqApi;
import com.pudonghot.yo.basic.model.enumeration.AgentTypeEnum;
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/update/BaseUpdateServReq.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/update/BaseUpdateServReq.java
index 39d95da7..b76bf371 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/update/BaseUpdateServReq.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/update/BaseUpdateServReq.java
@@ -2,9 +2,9 @@ package com.pudonghot.yo.service.request.update;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.service.request.UpdateServReq;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.service.request.UpdateServReq;
import com.pudonghot.yo.service.request.SessionServReqApi;
/**
diff --git a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/update/TenantUpdateServReq.java b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/update/TenantUpdateServReq.java
index f5051770..abfc6b99 100644
--- a/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/update/TenantUpdateServReq.java
+++ b/lib/service-impl/src/main/java/com/pudonghot/yo/service/request/update/TenantUpdateServReq.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.service.request.update;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/lib/tool/src/main/java/com/pudonghot/yo/tool/PhoneTool.java b/lib/tool/src/main/java/com/pudonghot/yo/tool/PhoneTool.java
index e3b019ec..330e7d6c 100644
--- a/lib/tool/src/main/java/com/pudonghot/yo/tool/PhoneTool.java
+++ b/lib/tool/src/main/java/com/pudonghot/yo/tool/PhoneTool.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.tool;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tool.response.PhoneInfo;
import org.springframework.validation.annotation.Validated;
diff --git a/lib/web-auth/pom.xml b/lib/web-auth/pom.xml
index 1aaf17e6..a2466349 100644
--- a/lib/web-auth/pom.xml
+++ b/lib/web-auth/pom.xml
@@ -24,11 +24,11 @@
yo-redis-api
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-security-cas
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-web
@@ -47,8 +47,8 @@
provided
- javax.servlet
- javax.servlet-api
+ jakarta.servlet
+ jakarta.servlet-api
provided
diff --git a/lib/web-auth/src/main/java/com/pudonghot/yo/webauth/SessionAbility.java b/lib/web-auth/src/main/java/com/pudonghot/yo/webauth/SessionAbility.java
index 90166f08..f6dc224e 100644
--- a/lib/web-auth/src/main/java/com/pudonghot/yo/webauth/SessionAbility.java
+++ b/lib/web-auth/src/main/java/com/pudonghot/yo/webauth/SessionAbility.java
@@ -70,14 +70,6 @@ public interface SessionAbility {
return principal.getProfile().getId().replaceAll("@.+$", "");
}
- /**
- * return current auth user permissions
- */
- default Set getPermissions() {
- val principal = (Pac4jPrincipal) SecurityUtils.getSubject().getPrincipal();
- return principal.getProfile().getPermissions();
- }
-
/**
* return current auth user roles
* @return current auth user roles
diff --git a/lib/web-auth/src/main/java/com/pudonghot/yo/webauth/UserProfileProviderImpl.java b/lib/web-auth/src/main/java/com/pudonghot/yo/webauth/UserProfileProviderImpl.java
index 66801389..06d405d0 100644
--- a/lib/web-auth/src/main/java/com/pudonghot/yo/webauth/UserProfileProviderImpl.java
+++ b/lib/web-auth/src/main/java/com/pudonghot/yo/webauth/UserProfileProviderImpl.java
@@ -4,7 +4,7 @@ import lombok.val;
import java.util.List;
import java.util.stream.Collectors;
-import me.chyxion.tigon.security.cas.UserProfileProvider;
+import com.pudonghot.tigon.security.cas.UserProfileProvider;
import org.pac4j.core.profile.UserProfile;
import org.springframework.util.Assert;
import org.pac4j.core.profile.CommonProfile;
@@ -61,7 +61,7 @@ public class UserProfileProviderImpl implements UserProfileProvider {
authInfoResp.setTenants(tenants);
profile.addAttribute("AUTH_INFO", authInfoResp);
- profile.addPermissions(authPermissionDal.listOfUser(account));
+ // profile.addPermissions(authPermissionDal.listOfUser(account));
// val currentTenant = currentTenant(account);
//
diff --git a/lib/web-auth/src/main/java/com/pudonghot/yo/webauth/aop/AuthControllerAspect.java b/lib/web-auth/src/main/java/com/pudonghot/yo/webauth/aop/AuthControllerAspect.java
index 23e7cb13..1da682f2 100644
--- a/lib/web-auth/src/main/java/com/pudonghot/yo/webauth/aop/AuthControllerAspect.java
+++ b/lib/web-auth/src/main/java/com/pudonghot/yo/webauth/aop/AuthControllerAspect.java
@@ -10,22 +10,22 @@ import org.aspectj.lang.JoinPoint;
import java.util.function.Function;
import org.apache.shiro.SecurityUtils;
import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
import java.lang.annotation.Annotation;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.shiro.util.ThreadContext;
import io.buji.pac4j.subject.Pac4jPrincipal;
-import me.chyxion.tigon.kit.bean.BeanService;
-import javax.servlet.http.HttpServletRequest;
+import com.pudonghot.tigon.kit.bean.BeanService;
+import jakarta.servlet.http.HttpServletRequest;
import com.pudonghot.yo.webauth.SessionAbility;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.util.ReflectionUtils;
import org.springframework.core.annotation.Order;
import org.springframework.web.multipart.MultipartFile;
-import me.chyxion.tigon.web.controller.annotation.TenantId;
-import me.chyxion.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.web.controller.annotation.TenantId;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -59,8 +59,8 @@ public class AuthControllerAspect implements SessionAbility {
|| @target(org.springframework.web.bind.annotation.RestController)
|| @within(org.springframework.web.bind.annotation.RestController)
- || @target(me.chyxion.tigon.web.controller.annotation.TigonController)
- || @within(me.chyxion.tigon.web.controller.annotation.TigonController)
+ || @target(com.pudonghot.tigon.web.controller.annotation.TigonController)
+ || @within(com.pudonghot.tigon.web.controller.annotation.TigonController)
)
&& (execution(@org.springframework.web.bind.annotation.RequestMapping * *(..))
|| execution(@org.springframework.web.bind.annotation.GetMapping * *(..))
diff --git a/lib/web-auth/src/main/java/com/pudonghot/yo/webauth/service/AuthService.java b/lib/web-auth/src/main/java/com/pudonghot/yo/webauth/service/AuthService.java
index e6438db0..b0ed3e9d 100644
--- a/lib/web-auth/src/main/java/com/pudonghot/yo/webauth/service/AuthService.java
+++ b/lib/web-auth/src/main/java/com/pudonghot/yo/webauth/service/AuthService.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.webauth.service;
import com.pudonghot.yo.basic.model.ValueTextModel;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.webauth.response.AuthTenantServResp;
import com.pudonghot.yo.webauth.response.AuthInfoServResp;
diff --git a/lib/web-common/pom.xml b/lib/web-common/pom.xml
index f76bc451..c7343341 100644
--- a/lib/web-common/pom.xml
+++ b/lib/web-common/pom.xml
@@ -20,11 +20,11 @@
slf4j-api
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-web
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-common
@@ -42,8 +42,8 @@
provided
- javax.servlet
- javax.servlet-api
+ jakarta.servlet
+ jakarta.servlet-api
provided
diff --git a/lib/web-common/src/main/java/com/pudonghot/yo/common/listener/RequestListener.java b/lib/web-common/src/main/java/com/pudonghot/yo/common/listener/RequestListener.java
index 02942fde..175838d6 100644
--- a/lib/web-common/src/main/java/com/pudonghot/yo/common/listener/RequestListener.java
+++ b/lib/web-common/src/main/java/com/pudonghot/yo/common/listener/RequestListener.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.common.listener;
import lombok.val;
import lombok.extern.slf4j.Slf4j;
import com.pudonghot.yo.util.LogMDC;
-import javax.servlet.ServletRequestEvent;
-import javax.servlet.ServletRequestListener;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletRequestEvent;
+import jakarta.servlet.ServletRequestListener;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Donghuang
diff --git a/pom.xml b/pom.xml
index 5c5be2b9..19801051 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,10 +19,15 @@
utf-8
0.0.1-SNAPSHOT
- 0.0.4-SNAPSHOT
+
+ 0.0.5-SNAPSHOT
1.0.0-SNAPSHOT
+
+ 3.3.3
+
5.3.30
2.7.16
+
3.2.6
3.16.2
@@ -33,7 +38,6 @@
- cas
cms
server
tj-cms
@@ -42,20 +46,21 @@
+
- org.springframework
- spring-framework-bom
- ${spring.version}
- import
- pom
+ com.pudonghot.tigon
+ tigon-mybatis
+ ${tigon-mybatis.version}
- org.springframework.boot
- spring-boot-dependencies
- ${spring-boot.version}
+ com.pudonghot.tigon
+ tigon
+ ${tigon.version}
pom
import
+
+
org.springframework.cloud
spring-cloud-openfeign-dependencies
@@ -92,20 +97,7 @@
redisson-spring-boot-starter
3.20.1
-
-
- com.pudonghot.tigon
- tigon-mybatis
- ${tigon-mybatis.version}
-
-
- me.chyxion.tigon
- tigon
- ${tigon.version}
- pom
- import
-
-
+
org.apache.curator
diff --git a/server/pom.xml b/server/pom.xml
index 959eec06..f7e6c0ae 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -48,7 +48,7 @@
yo-web-common
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-common
diff --git a/server/src/main/java/com/pudonghot/yo/agent/controller/DialController.java b/server/src/main/java/com/pudonghot/yo/agent/controller/DialController.java
index 0667ba9f..5156be51 100644
--- a/server/src/main/java/com/pudonghot/yo/agent/controller/DialController.java
+++ b/server/src/main/java/com/pudonghot/yo/agent/controller/DialController.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.agent.controller;
import lombok.val;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.tuple.Pair;
import com.pudonghot.yo.service.AgentService;
diff --git a/server/src/main/java/com/pudonghot/yo/agent/controller/request/CallDialCtrlrReq.java b/server/src/main/java/com/pudonghot/yo/agent/controller/request/CallDialCtrlrReq.java
index cab5df08..d851ce06 100644
--- a/server/src/main/java/com/pudonghot/yo/agent/controller/request/CallDialCtrlrReq.java
+++ b/server/src/main/java/com/pudonghot/yo/agent/controller/request/CallDialCtrlrReq.java
@@ -4,9 +4,9 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
/**
* @author Donghuang
diff --git a/server/src/main/java/com/pudonghot/yo/campaign/service/impl/CallingListServiceImpl.java b/server/src/main/java/com/pudonghot/yo/campaign/service/impl/CallingListServiceImpl.java
index b752f71d..b15b37e0 100644
--- a/server/src/main/java/com/pudonghot/yo/campaign/service/impl/CallingListServiceImpl.java
+++ b/server/src/main/java/com/pudonghot/yo/campaign/service/impl/CallingListServiceImpl.java
@@ -7,7 +7,7 @@ import lombok.extern.slf4j.Slf4j;
import com.pudonghot.yo.util.TimeUtils;
import org.springframework.stereotype.Service;
import org.apache.commons.lang3.time.DateUtils;
-import me.chyxion.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
import com.pudonghot.yo.dal.phone.PhoneAliasDal;
import com.pudonghot.yo.dal.callinglist.CallingListDal;
import com.pudonghot.yo.service.LeaderElectionService;
diff --git a/server/src/main/java/com/pudonghot/yo/fsagent/controller/CdrPostController.java b/server/src/main/java/com/pudonghot/yo/fsagent/controller/CdrPostController.java
index fbc69884..65b5c604 100644
--- a/server/src/main/java/com/pudonghot/yo/fsagent/controller/CdrPostController.java
+++ b/server/src/main/java/com/pudonghot/yo/fsagent/controller/CdrPostController.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.fsagent.controller;
import lombok.extern.slf4j.Slf4j;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import org.springframework.stereotype.Controller;
import com.pudonghot.yo.fsagent.service.cdr.CdrService;
import org.springframework.web.bind.annotation.PostMapping;
diff --git a/server/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanInboundController.java b/server/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanInboundController.java
index 39dd7f8f..6ae92006 100644
--- a/server/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanInboundController.java
+++ b/server/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanInboundController.java
@@ -5,7 +5,7 @@ import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import com.pudonghot.yo.fsagent.service.*;
import com.pudonghot.yo.service.AgentService;
-import me.chyxion.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
import org.springframework.stereotype.Controller;
import com.pudonghot.yo.service.AgentGroupService;
import com.pudonghot.yo.service.response.AgentServResp;
diff --git a/server/src/main/java/com/pudonghot/yo/fsagent/service/cdr/impl/CdrServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/cdr/impl/CdrServiceImpl.java
index 7609ceed..51209f22 100644
--- a/server/src/main/java/com/pudonghot/yo/fsagent/service/cdr/impl/CdrServiceImpl.java
+++ b/server/src/main/java/com/pudonghot/yo/fsagent/service/cdr/impl/CdrServiceImpl.java
@@ -6,7 +6,7 @@ import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import lombok.extern.slf4j.Slf4j;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.springframework.stereotype.Service;
import com.fasterxml.jackson.annotation.JsonAlias;
import com.pudonghot.yo.dal.cdr.CallDetailRecordDal;
diff --git a/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/BaseDialplanService.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/BaseDialplanService.java
index 3f938003..eb582bd5 100644
--- a/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/BaseDialplanService.java
+++ b/server/src/main/java/com/pudonghot/yo/fsagent/service/dialplan/impl/BaseDialplanService.java
@@ -7,7 +7,7 @@ import lombok.extern.slf4j.Slf4j;
import java.util.function.Function;
import java.util.function.Supplier;
import com.pudonghot.yo.fsagent.service.*;
-import me.chyxion.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
import org.apache.commons.lang3.tuple.Pair;
import org.springframework.util.DigestUtils;
import com.pudonghot.yo.service.TenantService;
diff --git a/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/AbstractDialer.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/AbstractDialer.java
index 2c69c32d..0de9c2c8 100644
--- a/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/AbstractDialer.java
+++ b/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/AbstractDialer.java
@@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.util.Assert;
import org.apache.commons.lang3.StringUtils;
import com.pudonghot.yo.dal.agent.model.Agent;
-import me.chyxion.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
import com.pudonghot.yo.dal.agent.AgentGroupDal;
import org.freeswitch.esl.client.inbound.Client;
import com.pudonghot.yo.dal.agent.model.AgentGroup;
diff --git a/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/CampaignDialServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/CampaignDialServiceImpl.java
index c7ea239e..a80ac85b 100644
--- a/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/CampaignDialServiceImpl.java
+++ b/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/CampaignDialServiceImpl.java
@@ -7,11 +7,11 @@ import com.pudonghot.yo.util.LogMDC;
import org.springframework.util.Assert;
import com.pudonghot.yo.dal.trunk.TrunkDal;
import com.pudonghot.yo.dal.queue.QueueDal;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.apache.commons.lang3.StringUtils;
import com.pudonghot.yo.dal.tenant.TenantDal;
import com.pudonghot.yo.fsagent.api.request.*;
-import me.chyxion.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
import org.freeswitch.esl.client.inbound.Client;
import com.pudonghot.yo.service.CallDataService;
import com.pudonghot.yo.dal.campaign.CampaignDal;
diff --git a/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialServiceImpl.java
index d0d18b7c..021f1ef6 100644
--- a/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialServiceImpl.java
+++ b/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialServiceImpl.java
@@ -16,7 +16,7 @@ import com.pudonghot.yo.dal.trunk.model.Trunk;
import com.pudonghot.yo.dal.tenant.model.Tenant;
import com.pudonghot.yo.dal.agent.AgentGroupDal;
import org.freeswitch.esl.client.inbound.Client;
-import me.chyxion.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
import com.pudonghot.yo.fsagent.api.DialService;
import com.pudonghot.yo.dal.agent.model.AgentGroup;
import com.pudonghot.yo.fsagent.api.request.CallLeg;
diff --git a/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialerOutside.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialerOutside.java
index db3bf0b5..f259e55e 100644
--- a/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialerOutside.java
+++ b/server/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialerOutside.java
@@ -5,7 +5,7 @@ import lombok.val;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import com.pudonghot.yo.dal.trunk.model.Trunk;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.apache.commons.lang3.tuple.Pair;
import org.springframework.util.DigestUtils;
import org.springframework.stereotype.Service;
diff --git a/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/IvrMenuServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/IvrMenuServiceImpl.java
index 3e4e47f2..08b416cc 100644
--- a/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/IvrMenuServiceImpl.java
+++ b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/IvrMenuServiceImpl.java
@@ -11,7 +11,7 @@ import com.pudonghot.yo.dal.ivr.model.IvrMenu;
import com.pudonghot.yo.dal.ivr.model.IvrEntry;
import com.pudonghot.yo.dal.ivr.IvrEntryDal;
import com.pudonghot.yo.dal.ivr.IvrMenuDal;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.springframework.stereotype.Service;
import com.pudonghot.yo.fsagent.service.IvrMenuService;
import com.pudonghot.yo.fsagent.model.IvrMenuAndEntries;
diff --git a/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/SipNotifyServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/SipNotifyServiceImpl.java
index ccd85279..caad7123 100644
--- a/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/SipNotifyServiceImpl.java
+++ b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/SipNotifyServiceImpl.java
@@ -6,7 +6,7 @@ import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.springframework.util.MimeTypeUtils;
import org.freeswitch.esl.client.inbound.Client;
import com.pudonghot.yo.fsagent.service.SipNotifyService;
diff --git a/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/TrunkServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/TrunkServiceImpl.java
index f30ad722..60017930 100644
--- a/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/TrunkServiceImpl.java
+++ b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/TrunkServiceImpl.java
@@ -8,7 +8,7 @@ import org.springframework.util.Assert;
import com.pudonghot.yo.dal.trunk.TrunkDal;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.lang3.StringUtils;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import com.pudonghot.yo.dal.misc.SequenceDal;
import com.pudonghot.yo.util.PhoneNumberUtils;
import org.springframework.stereotype.Service;
diff --git a/server/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusScheduleServiceImpl.java b/server/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusScheduleServiceImpl.java
index d3ed652b..47c648c0 100644
--- a/server/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusScheduleServiceImpl.java
+++ b/server/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusScheduleServiceImpl.java
@@ -5,7 +5,7 @@ import java.util.Date;
import lombok.extern.slf4j.Slf4j;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.agent.AgentDal;
-import me.chyxion.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.apache.commons.lang3.time.DateUtils;
diff --git a/tj-cms/pom.xml b/tj-cms/pom.xml
index 170380e6..6c62edda 100644
--- a/tj-cms/pom.xml
+++ b/tj-cms/pom.xml
@@ -32,11 +32,11 @@
yo-redis-raw
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-security-cas
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-service
@@ -44,7 +44,7 @@
yo-shiro-cache
- me.chyxion.tigon
+ com.pudonghot.tigon
tigon-common
@@ -106,7 +106,7 @@
java.base/java.lang=ALL-UNNAMED
--add-opens
java.base/java.lang.reflect=ALL-UNNAMED
- me.chyxion.tigon.web.controller.TigonControllerGenerator
+ com.pudonghot.tigon.web.controller.TigonControllerGenerator
--project-dir=${project.basedir}
--scan-package=com.pudonghot.yo.tj.cms
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/auth/SessionAbility.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/auth/SessionAbility.java
index 57340314..46843b04 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/auth/SessionAbility.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/auth/SessionAbility.java
@@ -25,14 +25,6 @@ public interface SessionAbility {
return principal.getProfile().getId().replaceAll("@.+$", "");
}
- /**
- * return current auth user permissions
- */
- default Set getPermissions() {
- val principal = (Pac4jPrincipal) SecurityUtils.getSubject().getPrincipal();
- return principal.getProfile().getPermissions();
- }
-
/**
* return current auth user roles
* @return current auth user roles
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/auth/UserProfileProviderImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/auth/UserProfileProviderImpl.java
index b6f68f38..12f0915d 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/auth/UserProfileProviderImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/auth/UserProfileProviderImpl.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.tj.cms.auth;
import lombok.extern.slf4j.Slf4j;
import org.pac4j.core.profile.UserProfile;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.security.cas.UserProfileProvider;
+import com.pudonghot.tigon.security.cas.UserProfileProvider;
/**
* @author Donghuang
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/auth/aop/AuthControllerAspect.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/auth/aop/AuthControllerAspect.java
index d79dcac6..1196c876 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/auth/aop/AuthControllerAspect.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/auth/aop/AuthControllerAspect.java
@@ -11,22 +11,22 @@ import org.aspectj.lang.JoinPoint;
import java.util.function.Function;
import org.apache.shiro.SecurityUtils;
import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
import java.lang.annotation.Annotation;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.shiro.util.ThreadContext;
import io.buji.pac4j.subject.Pac4jPrincipal;
-import me.chyxion.tigon.kit.bean.BeanService;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.pudonghot.tigon.kit.bean.BeanService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Component;
import org.springframework.util.ReflectionUtils;
import org.springframework.core.annotation.Order;
import org.springframework.web.multipart.MultipartFile;
-import me.chyxion.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -60,8 +60,8 @@ public class AuthControllerAspect implements SessionAbility {
|| @target(org.springframework.web.bind.annotation.RestController)
|| @within(org.springframework.web.bind.annotation.RestController)
- || @target(me.chyxion.tigon.web.controller.annotation.TigonController)
- || @within(me.chyxion.tigon.web.controller.annotation.TigonController)
+ || @target(com.pudonghot.tigon.web.controller.annotation.TigonController)
+ || @within(com.pudonghot.tigon.web.controller.annotation.TigonController)
)
&& (execution(@org.springframework.web.bind.annotation.RequestMapping * *(..))
|| execution(@org.springframework.web.bind.annotation.GetMapping * *(..))
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/auth/interceptor/ManagerInterceptor.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/auth/interceptor/ManagerInterceptor.java
index cd8ed2c2..de74f8e0 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/auth/interceptor/ManagerInterceptor.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/auth/interceptor/ManagerInterceptor.java
@@ -3,14 +3,14 @@ package com.pudonghot.yo.tj.cms.auth.interceptor;
import lombok.val;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
-import me.chyxion.tigon.web.JsonView;
+import com.pudonghot.tigon.web.JsonView;
import java.nio.charset.StandardCharsets;
-import me.chyxion.tigon.web.JsonViewModel;
-import me.chyxion.tigon.web.JsonViewConfig;
+import com.pudonghot.tigon.web.JsonViewModel;
+import com.pudonghot.tigon.web.JsonViewConfig;
import io.buji.pac4j.subject.Pac4jPrincipal;
-import javax.servlet.http.HttpServletRequest;
-import me.chyxion.tigon.kit.bean.BeanService;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import com.pudonghot.tigon.kit.bean.BeanService;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.util.MimeTypeUtils;
import org.springframework.stereotype.Component;
import org.springframework.beans.factory.InitializingBean;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/ControllerAdvice.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/ControllerAdvice.java
index e733b050..24a86252 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/ControllerAdvice.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/ControllerAdvice.java
@@ -2,12 +2,12 @@ package com.pudonghot.yo.tj.cms.controller;
import lombok.val;
import lombok.extern.slf4j.Slf4j;
-import me.chyxion.tigon.web.JsonView;
+import com.pudonghot.tigon.web.JsonView;
import lombok.RequiredArgsConstructor;
-import me.chyxion.tigon.web.JsonViewModel;
-import me.chyxion.tigon.web.JsonViewConfig;
+import com.pudonghot.tigon.web.JsonViewModel;
+import com.pudonghot.tigon.web.JsonViewConfig;
import org.apache.commons.lang3.StringUtils;
-import me.chyxion.tigon.web.util.ExceptionUtils;
+import com.pudonghot.tigon.web.util.ExceptionUtils;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Controller;
import org.springframework.core.annotation.Order;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/ErrorController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/ErrorController.java
index a099cf68..6060fec5 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/ErrorController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/ErrorController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.tj.cms.controller;
import lombok.val;
-import javax.servlet.RequestDispatcher;
+import jakarta.servlet.RequestDispatcher;
import org.springframework.http.HttpStatus;
-import me.chyxion.tigon.web.JsonViewModel;
-import javax.servlet.http.HttpServletRequest;
+import com.pudonghot.tigon.web.JsonViewModel;
+import jakarta.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/AgentController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/AgentController.java
index abf77310..26bdcfcf 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/AgentController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/AgentController.java
@@ -6,15 +6,15 @@ import com.pudonghot.yo.tj.cms.controller.agent.request.AgentCreateReqVO;
import com.pudonghot.yo.tj.cms.controller.agent.request.AgentUpdateReqVO;
import com.pudonghot.yo.tj.cms.service.agent.AgentService;
import com.pudonghot.yo.tj.cms.service.agent.request.AgentBatchCreateServReq;
-import me.chyxion.tigon.kit.bean.BeanService;
-import me.chyxion.tigon.web.controller.annotation.Api;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
/**
* @author Donghuang
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/AgentGroupController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/AgentGroupController.java
index 795914bb..12eed9fd 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/AgentGroupController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/AgentGroupController.java
@@ -1,9 +1,9 @@
package com.pudonghot.yo.tj.cms.controller.agent;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.tj.cms.service.agent.AgentGroupService;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.tj.cms.controller.agent.model.AgentGroupVO;
import com.pudonghot.yo.tj.cms.controller.agent.request.AgentGroupCreateReqVO;
import com.pudonghot.yo.tj.cms.controller.agent.request.AgentGroupUpdateReqVO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentBatchCreateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentBatchCreateReqVO.java
index f7e07faf..9c028658 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentBatchCreateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentBatchCreateReqVO.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.tj.cms.controller.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import org.hibernate.validator.constraints.Range;
import com.pudonghot.yo.tj.cms.request.BaseCreateReqVO;
import com.pudonghot.yo.basic.model.enumeration.AgentTypeEnum;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentCreateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentCreateReqVO.java
index 8fede05f..1d5e8b04 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentCreateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentCreateReqVO.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.tj.cms.controller.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import org.hibernate.validator.constraints.Range;
import com.pudonghot.yo.tj.cms.request.BaseCreateReqVO;
import com.pudonghot.yo.basic.model.enumeration.AgentTypeEnum;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentGroupCreateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentGroupCreateReqVO.java
index d2b02e59..c8f05355 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentGroupCreateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentGroupCreateReqVO.java
@@ -4,11 +4,11 @@ import com.pudonghot.yo.basic.model.enumeration.PrivacyLevelEnum;
import com.pudonghot.yo.tj.cms.request.BaseCreateReqVO;
import lombok.Getter;
import lombok.Setter;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import java.util.List;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentGroupUpdateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentGroupUpdateReqVO.java
index f1ec8db1..f48ce9dc 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentGroupUpdateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentGroupUpdateReqVO.java
@@ -3,10 +3,10 @@ package com.pudonghot.yo.tj.cms.controller.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.request.BaseUpdateReqVO;
import com.pudonghot.yo.basic.model.enumeration.PrivacyLevelEnum;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentUpdateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentUpdateReqVO.java
index d527a664..1ea7439a 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentUpdateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/agent/request/AgentUpdateReqVO.java
@@ -4,11 +4,11 @@ import com.pudonghot.yo.basic.model.enumeration.AgentTypeEnum;
import com.pudonghot.yo.tj.cms.request.BaseUpdateReqVO;
import lombok.Getter;
import lombok.Setter;
-import me.chyxion.tigon.annotation.Trim;
+import com.pudonghot.tigon.annotation.Trim;
import org.hibernate.validator.constraints.Range;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import java.util.List;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/ArticleController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/ArticleController.java
index 66e98fb2..e336ac4a 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/ArticleController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/ArticleController.java
@@ -1,11 +1,11 @@
package com.pudonghot.yo.tj.cms.controller.article;
import com.pudonghot.yo.tj.cms.controller.article.response.ArticleListRespVO;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.tj.cms.service.article.ArticleService;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.tj.cms.controller.article.model.ArticleVO;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.tj.cms.controller.article.request.ArticleListReqVO;
import com.pudonghot.yo.tj.cms.controller.article.request.ArticleCreateReqVO;
import com.pudonghot.yo.tj.cms.controller.article.request.ArticleUpdateReqVO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/ArticleGroupController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/ArticleGroupController.java
index a8ec1763..a030d6fc 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/ArticleGroupController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/ArticleGroupController.java
@@ -1,8 +1,8 @@
package com.pudonghot.yo.tj.cms.controller.article;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.web.bind.annotation.RequestMapping;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.tj.cms.service.article.ArticleGroupService;
import com.pudonghot.yo.tj.cms.controller.article.model.ArticleGroupVO;
import com.pudonghot.yo.tj.cms.controller.article.request.ArticleGroupCreateReqVO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleCreateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleCreateReqVO.java
index 04b52093..2fbb1fdc 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleCreateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleCreateReqVO.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.tj.cms.controller.article.request;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.request.BaseCreateReqVO;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleGroupCreateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleGroupCreateReqVO.java
index d6a3fd9d..52f4cbb6 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleGroupCreateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleGroupCreateReqVO.java
@@ -2,9 +2,9 @@ package com.pudonghot.yo.tj.cms.controller.article.request;
import lombok.Getter;
import lombok.Setter;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.request.BaseCreateReqVO;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleGroupUpdateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleGroupUpdateReqVO.java
index 56371b96..fe337a67 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleGroupUpdateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleGroupUpdateReqVO.java
@@ -2,8 +2,8 @@ package com.pudonghot.yo.tj.cms.controller.article.request;
import lombok.Getter;
import lombok.Setter;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.request.BaseUpdateReqVO;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleListReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleListReqVO.java
index 0935531f..fe418430 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleListReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleListReqVO.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.tj.cms.controller.article.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import me.chyxion.tigon.web.controller.request.ListCtrlrReq;
+import com.pudonghot.tigon.web.controller.request.ListCtrlrReq;
/**
* @author Donghuang
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleUpdateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleUpdateReqVO.java
index cc8473a0..fb43cea5 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleUpdateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/article/request/ArticleUpdateReqVO.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.tj.cms.controller.article.request;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.request.BaseUpdateReqVO;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/AuthController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/AuthController.java
index 27ef3386..24cf28d4 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/AuthController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/AuthController.java
@@ -2,8 +2,8 @@ package com.pudonghot.yo.tj.cms.controller.auth;
import lombok.val;
import io.buji.pac4j.subject.Pac4jPrincipal;
-import me.chyxion.tigon.kit.bean.BeanService;
-import javax.servlet.http.HttpServletRequest;
+import com.pudonghot.tigon.kit.bean.BeanService;
+import jakarta.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
import org.springframework.beans.factory.annotation.Autowired;
import com.pudonghot.yo.tj.cms.auth.response.AuthInfoServResp;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/AuthPermissionController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/AuthPermissionController.java
index ab2e0c38..429b640b 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/AuthPermissionController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/AuthPermissionController.java
@@ -1,14 +1,14 @@
package com.pudonghot.yo.tj.cms.controller.auth;
-import javax.validation.Valid;
-import me.chyxion.tigon.kit.bean.BeanService;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import jakarta.validation.Valid;
+import com.pudonghot.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.tj.cms.service.auth.AuthPermissionService;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.tj.cms.controller.auth.model.AuthPermissionVO;
import com.pudonghot.yo.tj.cms.service.auth.request.AuthPermBatchCreateServReq;
import com.pudonghot.yo.tj.cms.controller.auth.request.AuthPermBatchCreateReqVO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/AuthRoleController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/AuthRoleController.java
index 733b412a..a5159097 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/AuthRoleController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/AuthRoleController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.tj.cms.controller.auth;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.tj.cms.service.auth.AuthRoleService;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.tj.cms.controller.auth.model.AuthRoleVO;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.tj.cms.controller.auth.request.AuthRoleCreateReqVO;
import com.pudonghot.yo.tj.cms.controller.auth.request.AuthRoleUpdateReqVO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/AuthUserController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/AuthUserController.java
index 28c498bc..9d13411d 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/AuthUserController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/AuthUserController.java
@@ -1,14 +1,14 @@
package com.pudonghot.yo.tj.cms.controller.auth;
import java.util.List;
-import javax.validation.Valid;
-import me.chyxion.tigon.kit.bean.BeanService;
+import jakarta.validation.Valid;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.springframework.web.bind.annotation.*;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.tj.cms.service.auth.AuthUserService;
import org.springframework.beans.factory.annotation.Autowired;
import com.pudonghot.yo.tj.cms.controller.auth.model.AuthUserVO;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.tj.cms.controller.auth.request.AuthUserCreateReqVO;
import com.pudonghot.yo.tj.cms.controller.auth.request.AuthUserUpdateReqVO;
import com.pudonghot.yo.tj.cms.service.auth.request.AuthUserBatchCreateServReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthPermBatchCreateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthPermBatchCreateReqVO.java
index 1355b275..d268ec24 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthPermBatchCreateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthPermBatchCreateReqVO.java
@@ -2,8 +2,8 @@ package com.pudonghot.yo.tj.cms.controller.auth.request;
import lombok.Getter;
import lombok.Setter;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.request.BaseCreateReqVO;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthPermissionCreateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthPermissionCreateReqVO.java
index 83abd52b..ce97df02 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthPermissionCreateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthPermissionCreateReqVO.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.tj.cms.controller.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.request.BaseCreateReqVO;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthPermissionUpdateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthPermissionUpdateReqVO.java
index d01ad469..0ec2316f 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthPermissionUpdateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthPermissionUpdateReqVO.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.tj.cms.controller.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import me.chyxion.tigon.annotation.Trim;
+import com.pudonghot.tigon.annotation.Trim;
import com.pudonghot.yo.tj.cms.request.BaseUpdateReqVO;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthRoleCreateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthRoleCreateReqVO.java
index c2dbe36c..855f528b 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthRoleCreateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthRoleCreateReqVO.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.tj.cms.controller.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.request.BaseCreateReqVO;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthRoleUpdateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthRoleUpdateReqVO.java
index ec3d722b..7d010ec0 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthRoleUpdateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthRoleUpdateReqVO.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.tj.cms.controller.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.request.BaseUpdateReqVO;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthUserBatchCreateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthUserBatchCreateReqVO.java
index 7fb72b46..8f5e29b9 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthUserBatchCreateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthUserBatchCreateReqVO.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.tj.cms.controller.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.request.BaseCreateReqVO;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthUserBatchUpdateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthUserBatchUpdateReqVO.java
index 35521aca..8c697967 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthUserBatchUpdateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthUserBatchUpdateReqVO.java
@@ -4,10 +4,10 @@ import lombok.Getter;
import lombok.Setter;
import java.util.List;
import java.io.Serializable;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotEmpty;
-import me.chyxion.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
/**
* @author Donghuang
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthUserCreateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthUserCreateReqVO.java
index 2d79799b..f6abb93e 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthUserCreateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthUserCreateReqVO.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.tj.cms.controller.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import org.hibernate.validator.constraints.Length;
import com.pudonghot.yo.tj.cms.request.BaseCreateReqVO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthUserUpdateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthUserUpdateReqVO.java
index 66e8d2e5..66af089d 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthUserUpdateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/auth/request/AuthUserUpdateReqVO.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.tj.cms.controller.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.request.BaseUpdateReqVO;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/DeptController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/DeptController.java
index 48409f99..2e37da4a 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/DeptController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/DeptController.java
@@ -4,8 +4,8 @@ import java.util.List;
import com.pudonghot.yo.tj.cms.controller.dept.request.DeptRemoveMembersReqVO;
import com.pudonghot.yo.tj.cms.service.dept.request.DeptRemoveMembersServReq;
-import me.chyxion.tigon.kit.bean.BeanService;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.tj.cms.service.dept.DeptService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import com.pudonghot.yo.tj.cms.controller.dept.model.DeptVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.tj.cms.controller.dept.request.DeptCreateReqVO;
import com.pudonghot.yo.tj.cms.controller.dept.request.DeptUpdateReqVO;
import com.pudonghot.yo.tj.cms.controller.dept.response.DeptTreeDataVO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/request/DeptAddMembersReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/request/DeptAddMembersReqVO.java
index 31209667..84008d18 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/request/DeptAddMembersReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/request/DeptAddMembersReqVO.java
@@ -4,8 +4,8 @@ import lombok.Getter;
import lombok.Setter;
import java.util.List;
import java.io.Serializable;
-import javax.validation.constraints.NotNull;
-import me.chyxion.tigon.web.controller.annotation.Principal;
+import jakarta.validation.constraints.NotNull;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
/**
* @author Donghuang
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/request/DeptCreateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/request/DeptCreateReqVO.java
index 60932d0e..af609e3b 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/request/DeptCreateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/request/DeptCreateReqVO.java
@@ -2,11 +2,11 @@ package com.pudonghot.yo.tj.cms.controller.dept.request;
import lombok.Getter;
import lombok.Setter;
-import me.chyxion.tigon.annotation.Trim;
+import com.pudonghot.tigon.annotation.Trim;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.request.BaseCreateReqVO;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/request/DeptRemoveMembersReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/request/DeptRemoveMembersReqVO.java
index e3f5498d..1193f651 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/request/DeptRemoveMembersReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/request/DeptRemoveMembersReqVO.java
@@ -4,8 +4,8 @@ import lombok.Getter;
import lombok.Setter;
import java.util.List;
import java.io.Serializable;
-import javax.validation.constraints.NotNull;
-import me.chyxion.tigon.web.controller.annotation.Principal;
+import jakarta.validation.constraints.NotNull;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
/**
* @author Donghuang
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/request/DeptUpdateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/request/DeptUpdateReqVO.java
index e34a158e..421aadf0 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/request/DeptUpdateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/request/DeptUpdateReqVO.java
@@ -2,8 +2,8 @@ package com.pudonghot.yo.tj.cms.controller.dept.request;
import lombok.Getter;
import lombok.Setter;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.request.BaseUpdateReqVO;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/response/DeptTreeDataVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/response/DeptTreeDataVO.java
index 473cabab..6fb36cf9 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/response/DeptTreeDataVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/dept/response/DeptTreeDataVO.java
@@ -7,7 +7,7 @@ import java.util.List;
import lombok.ToString;
import com.pudonghot.yo.tj.cms.annotation.ViewDate;
import com.fasterxml.jackson.annotation.JsonProperty;
-import me.chyxion.tigon.web.controller.model.CtrlrModel;
+import com.pudonghot.tigon.web.controller.model.CtrlrModel;
import org.apache.commons.lang3.StringUtils;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/internal/MediateLetterSeqController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/internal/MediateLetterSeqController.java
index a3027e3b..9f2b01a2 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/internal/MediateLetterSeqController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/internal/MediateLetterSeqController.java
@@ -1,8 +1,8 @@
package com.pudonghot.yo.tj.cms.controller.internal;
import java.util.List;
-import javax.validation.Valid;
-import me.chyxion.tigon.kit.bean.BeanService;
+import jakarta.validation.Valid;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.springframework.stereotype.Controller;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/internal/request/MediateLetterGenSeqReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/internal/request/MediateLetterGenSeqReqVO.java
index 71480f17..c9f7fd4c 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/internal/request/MediateLetterGenSeqReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/internal/request/MediateLetterGenSeqReqVO.java
@@ -4,7 +4,7 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import org.hibernate.validator.constraints.Range;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/mediator/MediatorController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/mediator/MediatorController.java
index 65e2352e..957d81b3 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/mediator/MediatorController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/mediator/MediatorController.java
@@ -1,14 +1,14 @@
package com.pudonghot.yo.tj.cms.controller.mediator;
-import javax.validation.Valid;
-import me.chyxion.tigon.kit.bean.BeanService;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import jakarta.validation.Valid;
+import com.pudonghot.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.tj.cms.service.mediator.MediatorService;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.tj.cms.controller.mediator.model.MediatorVO;
import com.pudonghot.yo.tj.cms.controller.mediator.response.UuidRespVO;
import com.pudonghot.yo.tj.cms.controller.mediator.request.MediatorCreateReqVO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/mediator/request/MediatorBatchUpdateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/mediator/request/MediatorBatchUpdateReqVO.java
index 9e056fa5..05ea601f 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/mediator/request/MediatorBatchUpdateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/mediator/request/MediatorBatchUpdateReqVO.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.tj.cms.controller.mediator.request;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
/**
* @author Donghuang
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/mediator/request/MediatorCreateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/mediator/request/MediatorCreateReqVO.java
index 23396572..4cfc7c6e 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/mediator/request/MediatorCreateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/mediator/request/MediatorCreateReqVO.java
@@ -2,9 +2,9 @@ package com.pudonghot.yo.tj.cms.controller.mediator.request;
import lombok.Getter;
import lombok.Setter;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.request.BaseCreateReqVO;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/mediator/request/MediatorUpdateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/mediator/request/MediatorUpdateReqVO.java
index 012df6b5..61e628ab 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/mediator/request/MediatorUpdateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/mediator/request/MediatorUpdateReqVO.java
@@ -2,9 +2,9 @@ package com.pudonghot.yo.tj.cms.controller.mediator.request;
import lombok.Getter;
import lombok.Setter;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.request.BaseUpdateReqVO;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/ConfigController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/ConfigController.java
index f6d7a3a3..1719d1e2 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/ConfigController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/ConfigController.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.tj.cms.controller.openapi;
import lombok.val;
import java.util.Map;
import java.util.HashMap;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.springframework.stereotype.Controller;
import com.pudonghot.yo.tj.cms.service.site.SiteBannerService;
import com.pudonghot.yo.tj.cms.service.site.SiteConfigService;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/SiteArticleController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/SiteArticleController.java
index db8fe5a5..a187ae2b 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/SiteArticleController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/SiteArticleController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.tj.cms.controller.openapi;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import com.pudonghot.yo.tj.cms.service.article.ArticleService;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.tj.cms.controller.openapi.model.ArticleVO;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.tj.cms.controller.openapi.request.SiteArticleListReqVO;
import com.pudonghot.yo.tj.cms.controller.openapi.response.SiteArticleListRespVO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/SiteArticleGroupController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/SiteArticleGroupController.java
index 8be49ed0..cb42eafd 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/SiteArticleGroupController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/SiteArticleGroupController.java
@@ -1,8 +1,8 @@
package com.pudonghot.yo.tj.cms.controller.openapi;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.web.bind.annotation.RequestMapping;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.tj.cms.service.article.ArticleGroupService;
import com.pudonghot.yo.tj.cms.controller.openapi.model.ArticleGroupVO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/SiteMediatorController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/SiteMediatorController.java
index 17b7ef7d..c5a9f671 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/SiteMediatorController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/SiteMediatorController.java
@@ -1,9 +1,9 @@
package com.pudonghot.yo.tj.cms.controller.openapi;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.tj.cms.service.mediator.MediatorService;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.tj.cms.controller.openapi.model.MediatorVO;
import com.pudonghot.yo.tj.cms.controller.openapi.request.SiteMediatorListReqVO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/request/SiteArticleListReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/request/SiteArticleListReqVO.java
index 3edd51b8..dab7d14d 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/request/SiteArticleListReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/request/SiteArticleListReqVO.java
@@ -2,8 +2,8 @@ package com.pudonghot.yo.tj.cms.controller.openapi.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.web.controller.request.ListCtrlrReq;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.web.controller.request.ListCtrlrReq;
/**
* @author Donghuang
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/request/SiteMediatorListReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/request/SiteMediatorListReqVO.java
index bd88ae1d..27457706 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/request/SiteMediatorListReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/openapi/request/SiteMediatorListReqVO.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.tj.cms.controller.openapi.request;
import lombok.val;
import java.util.Arrays;
-import me.chyxion.tigon.web.controller.request.ListCtrlrReq;
+import com.pudonghot.tigon.web.controller.request.ListCtrlrReq;
/**
* @author Donghuang
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/SiteBannerController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/SiteBannerController.java
index 5ca39a81..25bdf8a1 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/SiteBannerController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/SiteBannerController.java
@@ -1,10 +1,10 @@
package com.pudonghot.yo.tj.cms.controller.site;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.tj.cms.service.site.SiteBannerService;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.tj.cms.controller.site.model.SiteBannerVO;
import com.pudonghot.yo.tj.cms.controller.site.request.SiteBannerListReqVO;
import com.pudonghot.yo.tj.cms.controller.site.request.SiteBannerCreateReqVO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/SiteConfigController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/SiteConfigController.java
index af2ac866..f7b7b7aa 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/SiteConfigController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/SiteConfigController.java
@@ -1,12 +1,12 @@
package com.pudonghot.yo.tj.cms.controller.site;
-import javax.validation.Valid;
-import me.chyxion.tigon.kit.bean.BeanService;
-import me.chyxion.tigon.web.controller.annotation.Api;
+import jakarta.validation.Valid;
+import com.pudonghot.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.web.controller.annotation.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import com.pudonghot.yo.tj.cms.service.site.SiteConfigService;
-import me.chyxion.tigon.web.controller.annotation.TigonController;
+import com.pudonghot.tigon.web.controller.annotation.TigonController;
import com.pudonghot.yo.tj.cms.controller.site.model.SiteConfigVO;
import com.pudonghot.yo.tj.cms.controller.site.request.SiteConfigFindReqVO;
import com.pudonghot.yo.tj.cms.controller.site.request.SiteConfigListReqVO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/request/SiteBannerListReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/request/SiteBannerListReqVO.java
index d6ded996..13f6c8cb 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/request/SiteBannerListReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/request/SiteBannerListReqVO.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.tj.cms.controller.site.request;
import lombok.Getter;
import lombok.Setter;
-import me.chyxion.tigon.web.controller.request.ListCtrlrReq;
+import com.pudonghot.tigon.web.controller.request.ListCtrlrReq;
/**
* 站点轮播图
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/request/SiteConfigFindReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/request/SiteConfigFindReqVO.java
index b3f1b51d..ab8078c7 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/request/SiteConfigFindReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/request/SiteConfigFindReqVO.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.tj.cms.controller.site.request;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
/**
* 站点配置
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/request/SiteConfigListReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/request/SiteConfigListReqVO.java
index 1913f98f..b76b1aa1 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/request/SiteConfigListReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/site/request/SiteConfigListReqVO.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.tj.cms.controller.site.request;
import lombok.Getter;
import lombok.Setter;
-import me.chyxion.tigon.web.controller.request.ListCtrlrReq;
+import com.pudonghot.tigon.web.controller.request.ListCtrlrReq;
/**
* 站点配置
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/system/AcsController.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/system/AcsController.java
index f4af7266..731b7518 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/system/AcsController.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/controller/system/AcsController.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.tj.cms.controller.system;
-import me.chyxion.tigon.kit.bean.BeanService;
+import com.pudonghot.tigon.kit.bean.BeanService;
import org.springframework.stereotype.Controller;
import com.pudonghot.yo.lib.aliyun.oss.OssService;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/agent/AgentDal.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/agent/AgentDal.java
index 984c866e..dd9bbfba 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/agent/AgentDal.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/agent/AgentDal.java
@@ -1,9 +1,9 @@
package com.pudonghot.yo.tj.cms.dal.agent;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import com.pudonghot.tigon.dal.BaseDal;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.dal.agent.model.Agent;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/agent/AgentGroupDal.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/agent/AgentGroupDal.java
index de64fbe2..51e73ed7 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/agent/AgentGroupDal.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/agent/AgentGroupDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.tj.cms.dal.agent;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.tj.cms.dal.agent.model.AgentGroup;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/agent/impl/AgentDalImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/agent/impl/AgentDalImpl.java
index 9dda5229..939ec984 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/agent/impl/AgentDalImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/agent/impl/AgentDalImpl.java
@@ -2,15 +2,15 @@ package com.pudonghot.yo.tj.cms.dal.agent.impl;
import java.util.List;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.request.FindDalReq;
-import me.chyxion.tigon.dal.request.ListDalReq;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.request.FindDalReq;
+import com.pudonghot.tigon.dal.request.ListDalReq;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.tj.cms.dal.agent.AgentDal;
import com.pudonghot.yo.tj.cms.dal.agent.model.Agent;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
import com.pudonghot.yo.tj.cms.dal.agent.mapper.AgentMapper;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/agent/impl/AgentGroupDalImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/agent/impl/AgentGroupDalImpl.java
index 450b24e8..06607c34 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/agent/impl/AgentGroupDalImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/agent/impl/AgentGroupDalImpl.java
@@ -2,11 +2,11 @@ package com.pudonghot.yo.tj.cms.dal.agent.impl;
import java.util.List;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.dal.annotation.FilterCol;
-import me.chyxion.tigon.dal.annotation.TenantResource;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.TenantResource;
import com.pudonghot.yo.tj.cms.dal.agent.AgentGroupDal;
import com.pudonghot.yo.tj.cms.dal.agent.model.AgentGroup;
import com.pudonghot.yo.tj.cms.dal.agent.mapper.AgentGroupMapper;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/article/ArticleDal.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/article/ArticleDal.java
index c74de69a..7eae75fa 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/article/ArticleDal.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/article/ArticleDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.tj.cms.dal.article;
import com.pudonghot.yo.tj.cms.dal.article.model.Article;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
/**
* 文章分组
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/article/ArticleGroupDal.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/article/ArticleGroupDal.java
index d0c1cc17..347f15dd 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/article/ArticleGroupDal.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/article/ArticleGroupDal.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.tj.cms.dal.article;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.tj.cms.dal.article.model.ArticleGroup;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/article/impl/ArticleDalImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/article/impl/ArticleDalImpl.java
index 72b2329b..55d42936 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/article/impl/ArticleDalImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/article/impl/ArticleDalImpl.java
@@ -8,11 +8,11 @@ import lombok.ToString;
import com.pudonghot.tigon.mybatis.Search;
import org.springframework.util.Assert;
import org.apache.commons.lang3.StringUtils;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.request.ListDalReq;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.request.ListDalReq;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.tj.cms.dal.article.ArticleDal;
import com.pudonghot.yo.tj.cms.dal.article.model.Article;
import com.pudonghot.yo.tj.cms.dal.article.ArticleGroupDal;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/article/impl/ArticleGroupDalImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/article/impl/ArticleGroupDalImpl.java
index a23b3d53..965db547 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/article/impl/ArticleGroupDalImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/article/impl/ArticleGroupDalImpl.java
@@ -1,11 +1,11 @@
package com.pudonghot.yo.tj.cms.dal.article.impl;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.request.ListDalReq;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.request.ListDalReq;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.tj.cms.dal.article.ArticleGroupDal;
import com.pudonghot.yo.tj.cms.dal.article.model.ArticleGroup;
import com.pudonghot.yo.tj.cms.dal.article.mapper.ArticleGroupMapper;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthPermissionDal.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthPermissionDal.java
index 9f0a989c..b386a269 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthPermissionDal.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthPermissionDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.tj.cms.dal.auth;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.tj.cms.dal.auth.model.AuthPermission;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthPermissionRoleDal.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthPermissionRoleDal.java
index beb89bef..8896d8e6 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthPermissionRoleDal.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthPermissionRoleDal.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.tj.cms.dal.auth;
import java.util.List;
import java.util.Collection;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.tj.cms.dal.auth.model.AuthPermissionRole;
import com.pudonghot.yo.tj.cms.dal.auth.request.AuthPermissionRoleCreateDalReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthRoleDal.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthRoleDal.java
index 1480b7aa..ce15b27e 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthRoleDal.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthRoleDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.tj.cms.dal.auth;
import com.pudonghot.yo.tj.cms.dal.auth.model.AuthRole;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.List;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthUserDal.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthUserDal.java
index 07e2b295..1a10a8d4 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthUserDal.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthUserDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.tj.cms.dal.auth;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.tj.cms.dal.auth.model.AuthUser;
import com.pudonghot.yo.tj.cms.dal.auth.request.AuthUserBatchUpdateDalReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthUserRoleDal.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthUserRoleDal.java
index c4b084ab..7eeb7e41 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthUserRoleDal.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/AuthUserRoleDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.tj.cms.dal.auth;
import com.pudonghot.yo.tj.cms.dal.auth.model.AuthUserRole;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.Collection;
import java.util.List;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthPermissionDalImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthPermissionDalImpl.java
index eeed0683..0581a6c9 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthPermissionDalImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthPermissionDalImpl.java
@@ -2,12 +2,12 @@ package com.pudonghot.yo.tj.cms.dal.auth.impl;
import java.util.List;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.request.FindDalReq;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.request.ListDalReq;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.request.FindDalReq;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.request.ListDalReq;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.tj.cms.dal.auth.AuthPermissionDal;
import com.pudonghot.yo.tj.cms.dal.auth.model.AuthPermission;
import com.pudonghot.yo.tj.cms.dal.auth.mapper.AuthPermissionMapper;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthPermissionRoleDalImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthPermissionRoleDalImpl.java
index b57adf28..68e71467 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthPermissionRoleDalImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthPermissionRoleDalImpl.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.tj.cms.dal.auth.impl;
import java.util.List;
import java.util.Collection;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.tj.cms.dal.auth.AuthPermissionRoleDal;
import com.pudonghot.yo.tj.cms.dal.auth.model.AuthPermissionRole;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthRoleDalImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthRoleDalImpl.java
index 87cf0a06..645e27c5 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthRoleDalImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthRoleDalImpl.java
@@ -3,9 +3,9 @@ package com.pudonghot.yo.tj.cms.dal.auth.impl;
import com.pudonghot.yo.tj.cms.dal.auth.AuthRoleDal;
import com.pudonghot.yo.tj.cms.dal.auth.mapper.AuthRoleMapper;
import com.pudonghot.yo.tj.cms.dal.auth.model.AuthRole;
-import me.chyxion.tigon.dal.annotation.FilterCol;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import com.pudonghot.tigon.mybatis.Search;
import org.springframework.stereotype.Component;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthUserDalImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthUserDalImpl.java
index ddde00e0..8ca10c04 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthUserDalImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthUserDalImpl.java
@@ -5,12 +5,12 @@ import java.util.Date;
import java.util.List;
import java.util.HashMap;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.request.FindDalReq;
-import me.chyxion.tigon.dal.annotation.ListApi;
-import me.chyxion.tigon.dal.request.ListDalReq;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.request.FindDalReq;
+import com.pudonghot.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.request.ListDalReq;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.tj.cms.dal.auth.AuthUserDal;
import com.pudonghot.yo.tj.cms.dal.auth.model.AuthUser;
import com.pudonghot.yo.tj.cms.dal.auth.mapper.AuthUserMapper;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthUserRoleDalImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthUserRoleDalImpl.java
index a07c8998..0bbbf643 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthUserRoleDalImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/auth/impl/AuthUserRoleDalImpl.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.tj.cms.dal.auth.impl;
import java.util.List;
import java.util.Collection;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.tj.cms.dal.auth.AuthUserRoleDal;
import com.pudonghot.yo.tj.cms.dal.auth.model.AuthUserRole;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/DeptAgentRelDal.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/DeptAgentRelDal.java
index b08da31e..a5885fdb 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/DeptAgentRelDal.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/DeptAgentRelDal.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.tj.cms.dal.dept;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.tj.cms.dal.dept.model.DeptAgentRel;
import com.pudonghot.yo.tj.cms.dal.dept.request.DeptAddMembersDalReq;
import com.pudonghot.yo.tj.cms.dal.dept.request.DeptRemoveMembersDalReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/DeptDal.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/DeptDal.java
index 36b66c86..51f18621 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/DeptDal.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/DeptDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.tj.cms.dal.dept;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.tj.cms.dal.dept.model.Dept;
import com.pudonghot.yo.tj.cms.dal.dept.response.DeptTreeDalResp;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/DeptPathDal.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/DeptPathDal.java
index da7a2c9e..57ff9939 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/DeptPathDal.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/DeptPathDal.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.tj.cms.dal.dept;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.tj.cms.dal.dept.model.DeptPath;
import com.pudonghot.yo.tj.cms.dal.dept.request.DeptPathBuildDalReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/impl/DeptAgentRelDalImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/impl/DeptAgentRelDalImpl.java
index 462872b8..098a335e 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/impl/DeptAgentRelDalImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/impl/DeptAgentRelDalImpl.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.tj.cms.dal.dept.impl;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.tj.cms.dal.dept.DeptAgentRelDal;
import com.pudonghot.yo.tj.cms.dal.dept.model.DeptAgentRel;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/impl/DeptDalImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/impl/DeptDalImpl.java
index 1f2ac420..c7404d31 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/impl/DeptDalImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/impl/DeptDalImpl.java
@@ -1,11 +1,11 @@
package com.pudonghot.yo.tj.cms.dal.dept.impl;
import java.util.List;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.tj.cms.dal.dept.DeptDal;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.tj.cms.dal.dept.model.Dept;
import com.pudonghot.yo.tj.cms.dal.dept.mapper.DeptMapper;
import com.pudonghot.yo.tj.cms.dal.dept.response.DeptTreeDalResp;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/impl/DeptPathDalImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/impl/DeptPathDalImpl.java
index 5e91b5e8..9059d8b9 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/impl/DeptPathDalImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/dept/impl/DeptPathDalImpl.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.tj.cms.dal.dept.impl;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.tj.cms.dal.dept.DeptPathDal;
import com.pudonghot.yo.tj.cms.dal.dept.model.DeptPath;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/mediator/MediatorDal.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/mediator/MediatorDal.java
index 7fe400e3..6240951e 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/mediator/MediatorDal.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/mediator/MediatorDal.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.tj.cms.dal.mediator;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.tj.cms.dal.mediator.model.Mediator;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/mediator/impl/MediatorDalImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/mediator/impl/MediatorDalImpl.java
index 7621e84c..fd1e702d 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/mediator/impl/MediatorDalImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/mediator/impl/MediatorDalImpl.java
@@ -1,11 +1,11 @@
package com.pudonghot.yo.tj.cms.dal.mediator.impl;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
-import me.chyxion.tigon.dal.request.ListDalReq;
-import me.chyxion.tigon.dal.annotation.ListApi;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.request.ListDalReq;
+import com.pudonghot.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
-import me.chyxion.tigon.dal.annotation.FilterCol;
+import com.pudonghot.tigon.dal.annotation.FilterCol;
import com.pudonghot.yo.tj.cms.dal.mediator.MediatorDal;
import com.pudonghot.yo.tj.cms.dal.mediator.model.Mediator;
import com.pudonghot.yo.tj.cms.dal.mediator.mapper.MediatorMapper;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/seq/SeqDal.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/seq/SeqDal.java
index 5714d5d1..479e3a54 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/seq/SeqDal.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/seq/SeqDal.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.tj.cms.dal.seq;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.tj.cms.dal.seq.model.Seq;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/seq/impl/SeqDalImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/seq/impl/SeqDalImpl.java
index 2fcd8d2a..ba9cafb1 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/seq/impl/SeqDalImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/seq/impl/SeqDalImpl.java
@@ -5,7 +5,7 @@ import org.springframework.stereotype.Component;
import com.pudonghot.yo.tj.cms.dal.seq.model.Seq;
import com.pudonghot.yo.tj.cms.dal.seq.mapper.SeqMapper;
import com.pudonghot.yo.tj.cms.dal.seq.SeqDal;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
/**
* 序号
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/site/SiteBannerDal.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/site/SiteBannerDal.java
index 7774f343..d7efcba3 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/site/SiteBannerDal.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/site/SiteBannerDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.tj.cms.dal.site;
import com.pudonghot.yo.tj.cms.dal.site.model.SiteBanner;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import java.util.List;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/site/SiteConfigDal.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/site/SiteConfigDal.java
index ffd18a45..e84d96f2 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/site/SiteConfigDal.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/site/SiteConfigDal.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.tj.cms.dal.site;
import java.util.List;
-import me.chyxion.tigon.dal.BaseDal;
+import com.pudonghot.tigon.dal.BaseDal;
import com.pudonghot.yo.tj.cms.dal.site.model.SiteConfig;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/site/impl/SiteBannerDalImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/site/impl/SiteBannerDalImpl.java
index 9d6fae39..2873c9b8 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/site/impl/SiteBannerDalImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/site/impl/SiteBannerDalImpl.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.tj.cms.dal.site.impl;
import java.util.List;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.tj.cms.dal.site.SiteBannerDal;
import com.pudonghot.yo.tj.cms.dal.site.model.SiteBanner;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/site/impl/SiteConfigDalImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/site/impl/SiteConfigDalImpl.java
index 03eddab3..0c999a22 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/site/impl/SiteConfigDalImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/dal/site/impl/SiteConfigDalImpl.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.tj.cms.dal.site.impl;
import java.util.List;
import com.pudonghot.tigon.mybatis.Search;
-import me.chyxion.tigon.dal.impl.BaseDalImpl;
+import com.pudonghot.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.tj.cms.dal.site.SiteConfigDal;
import com.pudonghot.yo.tj.cms.dal.site.model.SiteConfig;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/model/BaseCtrlrModel.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/model/BaseCtrlrModel.java
index 384acd97..a5528f5f 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/model/BaseCtrlrModel.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/model/BaseCtrlrModel.java
@@ -4,7 +4,7 @@ import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import com.pudonghot.yo.tj.cms.annotation.ViewDate;
-import me.chyxion.tigon.web.controller.model.CtrlrModel;
+import com.pudonghot.tigon.web.controller.model.CtrlrModel;
/**
* @author Donghuang
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/request/BaseCreateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/request/BaseCreateReqVO.java
index 0b126067..d44e4447 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/request/BaseCreateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/request/BaseCreateReqVO.java
@@ -4,9 +4,9 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import me.chyxion.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
/**
* @author Donghuang
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/request/BaseUpdateReqVO.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/request/BaseUpdateReqVO.java
index 4892f5bc..dca43a2d 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/request/BaseUpdateReqVO.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/request/BaseUpdateReqVO.java
@@ -4,9 +4,9 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
-import me.chyxion.tigon.annotation.Trim;
-import javax.validation.constraints.NotNull;
-import me.chyxion.tigon.web.controller.annotation.Principal;
+import com.pudonghot.tigon.annotation.Trim;
+import jakarta.validation.constraints.NotNull;
+import com.pudonghot.tigon.web.controller.annotation.Principal;
/**
* @author Donghuang
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/AgentGroupService.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/AgentGroupService.java
index b964adab..33d3b540 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/AgentGroupService.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/AgentGroupService.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.tj.cms.service.agent;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.tj.cms.service.agent.model.AgentGroupBO;
import com.pudonghot.yo.tj.cms.service.agent.request.AgentGroupUpdateServReq;
import com.pudonghot.yo.tj.cms.service.agent.request.AgentGroupCreateServReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/AgentService.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/AgentService.java
index 486a009d..4be30690 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/AgentService.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/AgentService.java
@@ -4,7 +4,7 @@ import com.pudonghot.yo.tj.cms.service.agent.model.AgentBO;
import com.pudonghot.yo.tj.cms.service.agent.request.AgentCreateServReq;
import com.pudonghot.yo.tj.cms.service.agent.request.AgentUpdateServReq;
import com.pudonghot.yo.tj.cms.service.agent.request.AgentBatchCreateServReq;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
/**
* @author Donghuang
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/impl/AgentGroupServiceImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/impl/AgentGroupServiceImpl.java
index 93db87e4..fcca04a5 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/impl/AgentGroupServiceImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/impl/AgentGroupServiceImpl.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.tj.cms.service.agent.impl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.tj.cms.dal.agent.AgentGroupDal;
import com.pudonghot.yo.tj.cms.dal.agent.model.AgentGroup;
import com.pudonghot.yo.tj.cms.service.agent.AgentGroupService;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/impl/AgentServiceImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/impl/AgentServiceImpl.java
index 5e95b9dc..a348148f 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/impl/AgentServiceImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/impl/AgentServiceImpl.java
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
import org.apache.commons.lang3.RandomStringUtils;
import com.pudonghot.yo.tj.cms.dal.agent.AgentDal;
import com.pudonghot.yo.tj.cms.dal.agent.model.Agent;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.tj.cms.service.agent.AgentService;
import org.springframework.beans.factory.annotation.Value;
import com.pudonghot.yo.tj.cms.service.agent.model.AgentBO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentBatchCreateServReq.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentBatchCreateServReq.java
index 74a34b67..110ddcee 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentBatchCreateServReq.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentBatchCreateServReq.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.tj.cms.service.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import org.hibernate.validator.constraints.Range;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.pudonghot.yo.basic.model.enumeration.AgentTypeEnum;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentCreateServReq.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentCreateServReq.java
index 10a66b7f..e318a68f 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentCreateServReq.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentCreateServReq.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.tj.cms.service.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import org.hibernate.validator.constraints.Range;
import com.pudonghot.yo.basic.model.enumeration.AgentTypeEnum;
import com.pudonghot.yo.tj.cms.service.request.BaseCreateServReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentGroupCreateServReq.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentGroupCreateServReq.java
index e6a1be54..7408a578 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentGroupCreateServReq.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentGroupCreateServReq.java
@@ -3,10 +3,10 @@ package com.pudonghot.yo.tj.cms.service.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.basic.model.enumeration.PrivacyLevelEnum;
import com.pudonghot.yo.tj.cms.service.request.BaseCreateServReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentGroupUpdateServReq.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentGroupUpdateServReq.java
index 3b5531d9..bb563c35 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentGroupUpdateServReq.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentGroupUpdateServReq.java
@@ -3,10 +3,10 @@ package com.pudonghot.yo.tj.cms.service.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.service.request.BaseUpdateServReq;
import com.pudonghot.yo.basic.model.enumeration.PrivacyLevelEnum;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentUpdateServReq.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentUpdateServReq.java
index aa3c0817..e9a54723 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentUpdateServReq.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/agent/request/AgentUpdateServReq.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.tj.cms.service.agent.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import org.hibernate.validator.constraints.Range;
import com.pudonghot.yo.basic.model.enumeration.AgentTypeEnum;
import com.pudonghot.yo.tj.cms.service.request.BaseUpdateServReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/article/ArticleGroupService.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/article/ArticleGroupService.java
index 595d07fd..d52edb91 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/article/ArticleGroupService.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/article/ArticleGroupService.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.tj.cms.service.article;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.tj.cms.service.article.model.ArticleGroupBO;
import com.pudonghot.yo.tj.cms.service.article.request.ArticleGroupCreateServReq;
import com.pudonghot.yo.tj.cms.service.article.request.ArticleGroupUpdateServReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/article/ArticleService.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/article/ArticleService.java
index 1c9996d7..595a1c53 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/article/ArticleService.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/article/ArticleService.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.tj.cms.service.article;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.tj.cms.service.article.model.ArticleBO;
import com.pudonghot.yo.tj.cms.service.article.request.ArticleCreateServReq;
import com.pudonghot.yo.tj.cms.service.article.request.ArticleUpdateServReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/article/impl/ArticleGroupServiceImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/article/impl/ArticleGroupServiceImpl.java
index fa2310ba..2af80eb3 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/article/impl/ArticleGroupServiceImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/article/impl/ArticleGroupServiceImpl.java
@@ -4,7 +4,7 @@ import lombok.val;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.Assert;
import org.springframework.stereotype.Service;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.tj.cms.dal.article.ArticleGroupDal;
import com.pudonghot.yo.tj.cms.dal.article.model.ArticleGroup;
import com.pudonghot.yo.tj.cms.service.article.ArticleGroupService;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/article/impl/ArticleServiceImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/article/impl/ArticleServiceImpl.java
index 9000febe..f6db5d60 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/article/impl/ArticleServiceImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/article/impl/ArticleServiceImpl.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.tj.cms.service.article.impl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import com.pudonghot.yo.tj.cms.dal.article.ArticleDal;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.tj.cms.dal.article.model.Article;
import com.pudonghot.yo.tj.cms.service.article.ArticleService;
import com.pudonghot.yo.tj.cms.service.article.model.ArticleBO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/AuthPermissionService.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/AuthPermissionService.java
index 4f1a3039..170a8e8b 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/AuthPermissionService.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/AuthPermissionService.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.tj.cms.service.auth;
import java.util.List;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.tj.cms.service.auth.model.AuthPermissionBO;
import com.pudonghot.yo.tj.cms.service.auth.request.AuthPermBatchCreateServReq;
import com.pudonghot.yo.tj.cms.service.auth.request.AuthPermissionCreateServReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/AuthRoleService.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/AuthRoleService.java
index 569d21da..e81cee74 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/AuthRoleService.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/AuthRoleService.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.tj.cms.service.auth;
import java.util.List;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.tj.cms.service.auth.model.AuthRoleBO;
import com.pudonghot.yo.tj.cms.service.auth.request.AuthRoleCreateServReq;
import com.pudonghot.yo.tj.cms.service.auth.request.AuthRoleUpdateServReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/AuthUserService.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/AuthUserService.java
index b43f6133..872ac150 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/AuthUserService.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/AuthUserService.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.tj.cms.service.auth;
import java.util.List;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.tj.cms.service.auth.model.AuthUserBO;
import com.pudonghot.yo.tj.cms.service.auth.request.AuthUserUpdateServReq;
import com.pudonghot.yo.tj.cms.service.auth.request.AuthUserCreateServReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/impl/AuthPermissionServiceImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/impl/AuthPermissionServiceImpl.java
index bf04cb88..5e707db9 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/impl/AuthPermissionServiceImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/impl/AuthPermissionServiceImpl.java
@@ -7,12 +7,12 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.util.Assert;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
-import me.chyxion.tigon.service.request.FindServReq;
+import com.pudonghot.tigon.service.request.FindServReq;
import com.pudonghot.yo.tj.cms.dal.auth.AuthRoleDal;
-import me.chyxion.tigon.service.request.ListServReq;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
-import me.chyxion.tigon.service.request.DeleteServReq;
-import me.chyxion.tigon.service.response.ListServResp;
+import com.pudonghot.tigon.service.request.ListServReq;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.request.DeleteServReq;
+import com.pudonghot.tigon.service.response.ListServResp;
import com.pudonghot.yo.tj.cms.dal.auth.AuthPermissionDal;
import com.pudonghot.yo.tj.cms.dal.auth.model.AuthPermission;
import com.pudonghot.yo.tj.cms.service.auth.model.AuthRoleBO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/impl/AuthRoleServiceImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/impl/AuthRoleServiceImpl.java
index 552b345a..b64d05a1 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/impl/AuthRoleServiceImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/impl/AuthRoleServiceImpl.java
@@ -10,10 +10,10 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.util.Assert;
import org.springframework.stereotype.Service;
import com.pudonghot.yo.tj.cms.dal.auth.AuthRoleDal;
-import me.chyxion.tigon.service.request.FindServReq;
-import me.chyxion.tigon.service.request.BatchServReq;
-import me.chyxion.tigon.service.request.DeleteServReq;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.request.FindServReq;
+import com.pudonghot.tigon.service.request.BatchServReq;
+import com.pudonghot.tigon.service.request.DeleteServReq;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.tj.cms.dal.auth.model.AuthRole;
import com.pudonghot.yo.tj.cms.dal.auth.AuthUserRoleDal;
import com.pudonghot.yo.tj.cms.service.util.SetDiffUtils;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/impl/AuthUserServiceImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/impl/AuthUserServiceImpl.java
index 0a34ed66..d669bca2 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/impl/AuthUserServiceImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/impl/AuthUserServiceImpl.java
@@ -14,12 +14,12 @@ import org.springframework.util.CollectionUtils;
import com.pudonghot.yo.tj.cms.dal.auth.AuthRoleDal;
import com.pudonghot.yo.tj.cms.dal.auth.AuthUserDal;
import org.apache.commons.codec.digest.DigestUtils;
-import me.chyxion.tigon.service.request.FindServReq;
-import me.chyxion.tigon.service.request.ListServReq;
-import me.chyxion.tigon.service.request.BatchServReq;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
-import me.chyxion.tigon.service.request.DeleteServReq;
-import me.chyxion.tigon.service.response.ListServResp;
+import com.pudonghot.tigon.service.request.FindServReq;
+import com.pudonghot.tigon.service.request.ListServReq;
+import com.pudonghot.tigon.service.request.BatchServReq;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.request.DeleteServReq;
+import com.pudonghot.tigon.service.response.ListServResp;
import com.pudonghot.yo.tj.cms.dal.auth.model.AuthUser;
import com.pudonghot.yo.tj.cms.dal.dept.DeptAgentRelDal;
import com.pudonghot.yo.tj.cms.dal.auth.AuthUserRoleDal;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthPermBatchCreateServReq.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthPermBatchCreateServReq.java
index 580dc2a5..c1ef7564 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthPermBatchCreateServReq.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthPermBatchCreateServReq.java
@@ -2,7 +2,7 @@ package com.pudonghot.yo.tj.cms.service.auth.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.service.request.BaseCreateServReq;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthPermissionCreateServReq.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthPermissionCreateServReq.java
index a5968747..69ea07ef 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthPermissionCreateServReq.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthPermissionCreateServReq.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.tj.cms.service.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.service.request.BaseCreateServReq;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthRoleCreateServReq.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthRoleCreateServReq.java
index 01233f76..743660dd 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthRoleCreateServReq.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthRoleCreateServReq.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.tj.cms.service.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.service.request.BaseCreateServReq;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthUserBatchCreateServReq.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthUserBatchCreateServReq.java
index 131648c6..b3bbfa4e 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthUserBatchCreateServReq.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthUserBatchCreateServReq.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.tj.cms.service.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
import com.pudonghot.yo.tj.cms.service.request.BaseCreateServReq;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthUserCreateServReq.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthUserCreateServReq.java
index d662fdd5..563e76e4 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthUserCreateServReq.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthUserCreateServReq.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.tj.cms.service.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
import org.hibernate.validator.constraints.Length;
import com.pudonghot.yo.tj.cms.service.request.BaseCreateServReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthUserUpdateServReq.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthUserUpdateServReq.java
index 5918d010..d71f484c 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthUserUpdateServReq.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/auth/request/AuthUserUpdateServReq.java
@@ -3,8 +3,8 @@ package com.pudonghot.yo.tj.cms.service.auth.request;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
-import javax.validation.constraints.NotBlank;
-import me.chyxion.tigon.service.request.UpdateServReq;
+import jakarta.validation.constraints.NotBlank;
+import com.pudonghot.tigon.service.request.UpdateServReq;
import com.pudonghot.yo.tj.cms.service.request.BaseUpdateServReq;
/**
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/dept/DeptService.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/dept/DeptService.java
index 2525fbdd..1165297f 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/dept/DeptService.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/dept/DeptService.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.tj.cms.service.dept;
import java.util.List;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.tj.cms.service.dept.model.DeptBO;
import com.pudonghot.yo.tj.cms.service.dept.response.DeptTreeModel;
import com.pudonghot.yo.tj.cms.service.dept.request.DeptCreateServReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/dept/impl/DeptServiceImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/dept/impl/DeptServiceImpl.java
index e3d607da..722e4d39 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/dept/impl/DeptServiceImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/dept/impl/DeptServiceImpl.java
@@ -7,12 +7,12 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.util.Assert;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
-import me.chyxion.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
import com.pudonghot.yo.tj.cms.dal.dept.DeptDal;
import com.pudonghot.yo.tj.cms.dal.dept.model.Dept;
import com.pudonghot.yo.tj.cms.dal.dept.DeptPathDal;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
-import me.chyxion.tigon.service.request.DeleteServReq;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.request.DeleteServReq;
import com.pudonghot.yo.tj.cms.dal.dept.DeptAgentRelDal;
import com.pudonghot.yo.tj.cms.service.dept.DeptService;
import com.pudonghot.yo.tj.cms.service.dept.model.DeptBO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/mediator/MediatorService.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/mediator/MediatorService.java
index 4d902266..b16b5860 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/mediator/MediatorService.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/mediator/MediatorService.java
@@ -1,6 +1,6 @@
package com.pudonghot.yo.tj.cms.service.mediator;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.tj.cms.service.mediator.model.MediatorBO;
import com.pudonghot.yo.tj.cms.service.mediator.response.UuidServResp;
import com.pudonghot.yo.tj.cms.service.mediator.request.MediatorUpdateServReq;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/mediator/impl/MediatorServiceImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/mediator/impl/MediatorServiceImpl.java
index 3a0f117a..a640d45c 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/mediator/impl/MediatorServiceImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/mediator/impl/MediatorServiceImpl.java
@@ -10,11 +10,11 @@ import lombok.extern.slf4j.Slf4j;
import java.util.function.Consumer;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
-import me.chyxion.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
import com.pudonghot.yo.lib.aliyun.oss.OssService;
-import me.chyxion.tigon.service.request.BatchServReq;
-import me.chyxion.tigon.service.request.DeleteServReq;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.request.BatchServReq;
+import com.pudonghot.tigon.service.request.DeleteServReq;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.tj.cms.dal.mediator.MediatorDal;
import org.springframework.beans.factory.annotation.Value;
import com.pudonghot.yo.tj.cms.dal.mediator.model.Mediator;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/request/BaseUpdateServReq.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/request/BaseUpdateServReq.java
index 7a40a252..b83e8399 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/request/BaseUpdateServReq.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/request/BaseUpdateServReq.java
@@ -2,8 +2,8 @@ package com.pudonghot.yo.tj.cms.service.request;
import lombok.Getter;
import lombok.Setter;
-import javax.validation.constraints.NotNull;
-import me.chyxion.tigon.service.request.UpdateServReq;
+import jakarta.validation.constraints.NotNull;
+import com.pudonghot.tigon.service.request.UpdateServReq;
/**
* @author Donghuang
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/site/SiteBannerService.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/site/SiteBannerService.java
index e072b7e3..2151fe1a 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/site/SiteBannerService.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/site/SiteBannerService.java
@@ -1,7 +1,7 @@
package com.pudonghot.yo.tj.cms.service.site;
import java.util.List;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import com.pudonghot.yo.tj.cms.service.site.model.SiteBannerBO;
import com.pudonghot.yo.tj.cms.service.site.request.SiteBannerCreateReqBO;
import com.pudonghot.yo.tj.cms.service.site.request.SiteBannerUpdateReqBO;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/site/SiteConfigService.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/site/SiteConfigService.java
index bfb314c2..77664f40 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/site/SiteConfigService.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/site/SiteConfigService.java
@@ -3,7 +3,7 @@ package com.pudonghot.yo.tj.cms.service.site;
import com.pudonghot.yo.tj.cms.service.site.model.SiteConfigBO;
import com.pudonghot.yo.tj.cms.service.site.request.SiteConfigCreateReqBO;
import com.pudonghot.yo.tj.cms.service.site.request.SiteConfigUpdateReqBO;
-import me.chyxion.tigon.service.TigonService;
+import com.pudonghot.tigon.service.TigonService;
import java.util.List;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/site/impl/SiteBannerServiceImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/site/impl/SiteBannerServiceImpl.java
index cbfba14c..7ebe73a9 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/site/impl/SiteBannerServiceImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/site/impl/SiteBannerServiceImpl.java
@@ -4,9 +4,9 @@ import lombok.val;
import java.util.List;
import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
-import me.chyxion.tigon.kit.sequence.IdSequence;
+import com.pudonghot.tigon.kit.sequence.IdSequence;
import com.pudonghot.yo.tj.cms.dal.site.SiteBannerDal;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.tj.cms.dal.site.model.SiteBanner;
import org.springframework.beans.factory.annotation.Value;
import com.pudonghot.yo.tj.cms.service.site.SiteBannerService;
diff --git a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/site/impl/SiteConfigServiceImpl.java b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/site/impl/SiteConfigServiceImpl.java
index 04af2d46..920ad41c 100644
--- a/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/site/impl/SiteConfigServiceImpl.java
+++ b/tj-cms/src/main/java/com/pudonghot/yo/tj/cms/service/site/impl/SiteConfigServiceImpl.java
@@ -5,7 +5,7 @@ import java.util.List;
import org.springframework.util.Assert;
import org.springframework.stereotype.Service;
import com.pudonghot.yo.tj.cms.dal.site.SiteConfigDal;
-import me.chyxion.tigon.service.impl.TigonServiceImpl;
+import com.pudonghot.tigon.service.impl.TigonServiceImpl;
import com.pudonghot.yo.tj.cms.dal.site.model.SiteConfig;
import com.pudonghot.yo.tj.cms.service.site.SiteConfigService;
import com.pudonghot.yo.tj.cms.service.site.model.SiteConfigBO;