fanxb/bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Merge pull request 'dev' (#12) from dev into master

Browse Source 
Reviewed-on: #12
This commit is contained in:
fanxb 2023-04-01 05:30:11 -04:00
commit 9dc1fe47d9
4 changed files with 7842 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bookMarkService/common/src/main/java/com/fanxb/bookmark/common/service/impl/ConfigServiceImpl.java
View File

@ -49,7 +49,6 @@ public class ConfigServiceImpl implements ConfigService {
List<GlobalConfigPo> pos = globalConfigDao.selectByMap(Collections.emptyMap()); List<GlobalConfigPo> pos = globalConfigDao.selectByMap(Collections.emptyMap());
Map<String, String> map = pos.stream().collect(Collectors.toMap(GlobalConfigPo::getCode, GlobalConfigPo::getValue)); Map<String, String> map = pos.stream().collect(Collectors.toMap(GlobalConfigPo::getCode, GlobalConfigPo::getValue));
GlobalConfigVo vo = new GlobalConfigVo(); GlobalConfigVo vo = new GlobalConfigVo();
vo.setProxyExist(HttpUtil.getProxyExist());
vo.setBingImgSrc(getCacheBingImg()); vo.setBingImgSrc(getCacheBingImg());
vo.setMap(map); vo.setMap(map);
return vo; return vo;

10
bookmark_front/package.json
View File

@ -20,11 +20,11 @@
"vuex": "^3.4.0" "vuex": "^3.4.0"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "~4.4.0", "@vue/cli-plugin-babel": "~5.0.8",
"@vue/cli-plugin-eslint": "~4.4.0", "@vue/cli-plugin-eslint": "~5.0.8",
"@vue/cli-plugin-router": "~4.4.0", "@vue/cli-plugin-router": "~5.0.8",
"@vue/cli-plugin-vuex": "~4.4.0", "@vue/cli-plugin-vuex": "~5.0.8",
"@vue/cli-service": "~4.4.0", "@vue/cli-service": "~5.0.8",
"@vue/eslint-config-airbnb": "^5.0.2", "@vue/eslint-config-airbnb": "^5.0.2",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"eslint": "^6.7.2", "eslint": "^6.7.2",

7824
bookmark_front/pnpm-lock.yaml generated Normal file
View File

File diff suppressed because it is too large Load Diff

23
bookmark_front/src/views/public/login/index.vue
View File

@ -24,7 +24,7 @@
</div> </div>
<div class="thirdPart"> <div class="thirdPart">
<span>第三方登陆</span> <span>第三方登陆</span>
<a-tooltip v-if="serverConfig.proxyExist" title="github登陆" class="oneIcon" placement="bottom"> <a-tooltip title="github登陆" class="oneIcon" placement="bottom">
<a-icon type="github" @click="toGithub" style="font-size: 1.4em" /> <a-icon type="github" @click="toGithub" style="font-size: 1.4em" />
</a-tooltip> </a-tooltip>
</div> </div>
@ -39,35 +39,36 @@ import Header from "@/components/public/Switch.vue";
import httpUtil from "../../../util/HttpUtil.js"; import httpUtil from "../../../util/HttpUtil.js";
import { mapMutations, mapState } from "vuex"; import { mapMutations, mapState } from "vuex";
import HttpUtil from "../../../util/HttpUtil.js"; import HttpUtil from "../../../util/HttpUtil.js";
export default { export default {
name: "Login", name: "Login",
components: { components: {
Header, Header
}, },
computed: { computed: {
...mapState("globalConfig", ["serverConfig"]), ...mapState("globalConfig", ["serverConfig"])
}, },
data() { data() {
return { return {
form: { form: {
str: "", str: "",
password: "", password: "",
rememberMe: false, rememberMe: false
}, },
rules: { rules: {
str: [ str: [
{ required: true, message: "请输入用户名", trigger: "blur" }, { required: true, message: "请输入用户名", trigger: "blur" },
{ min: 1, max: 50, message: "最短1，最长50", trigger: "change" }, { min: 1, max: 50, message: "最短1，最长50", trigger: "change" }
], ],
password: [ password: [
{ required: true, message: "请输入密码", trigger: "blur" }, { required: true, message: "请输入密码", trigger: "blur" },
{ pattern: "^\\w{6,18}$", message: "密码为6-18位数字,字母,下划线组合", trigger: "change" }, { pattern: "^\\w{6,18}$", message: "密码为6-18位数字,字母,下划线组合", trigger: "change" }
], ]
}, },
loading: false, //是否加载中 loading: false, //是否加载中
oauthLogining: false, //true:正在进行oauth后台操作 oauthLogining: false, //true:正在进行oauth后台操作
page: null, //oauth打开的页面实例 page: null, //oauth打开的页面实例
redirect: null, redirect: null
}; };
}, },
async created() { async created() {
@ -130,8 +131,8 @@ export default {
} finally { } finally {
this.loading = false; this.loading = false;
} }
}, }
}, }
}; };
</script> </script>
@ -139,11 +140,13 @@ export default {
.form { .form {
margin: 0.3rem; margin: 0.3rem;
margin-bottom: 0.1rem; margin-bottom: 0.1rem;
.reset { .reset {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
} }
.thirdPart { .thirdPart {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;