Skip to content

A
Aidea
Commit 497cacd8 authored by 谢希宇's avatar 谢希宇
Browse files
Options

Aidea product update by Strive Date 2020-10-10

parent 366b16dd
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 49 deletions
cftech-common-web/src/main/webapp/WEB-INF/views/login.html
View file @ 497cacd8
......@@ -34,8 +34,9 @@
<link rel="shortcut icon" href="favicon.ico"/>
<style>
.login{
background-image: url('img/homepage.jpg');
background-size: 100%;
/*background-color: #209CDC;*/
/*background-image: url('img/logo-aidi.jpg');*/
/*background-size: 100%;*/
background-repeat: no-repeat;
}
.login .content {
......@@ -62,16 +63,15 @@
overflow: hidden;
}
.form-title{
color: #00883c !important;
font-size: 22px !important;text-align: left !important;
}
.btn-success{
background-color:#00883c;
/*background-color:#00883c;*/
}
.btn-success:hover, .btn-success:focus, .btn-success:active, .btn-success.active,.btn-success:active:hover, .btn-success.active:hover {
background-color:#00883c;
/*background-color:#00883c;*/
}
.login .content .form-actions .btn-success {
......
cftech-common-web/src/main/webapp/assets/adminlte/admin/login.css
View file @ 497cacd8
......@@ -7,7 +7,7 @@ Login page
***/
/* bg color */
.login {
background-color: #364150 !important;
/*background-color: #364150 !important;*/
}
.login .logo {
......@@ -35,7 +35,6 @@ Login page
}
.login .content h3 {
color: #4db3a5;
text-align: center;
font-size: 28px;
font-weight: 600 !important;
......
portal-web/overlays/com.cftech.workflow-module-web-1.0-SNAPSHOT/WEB-INF/views/login.html
View file @ 497cacd8
......@@ -34,8 +34,9 @@
<link rel="shortcut icon" href="favicon.ico"/>
<style>
.login{
background-image: url('img/homepage.jpg');
background-size: 100%;
/*background-color: #209CDC;*/
/*background-image: url('img/logo-aidi.jpg');*/
/*background-size: 100%;*/
background-repeat: no-repeat;
}
.login .content {
......@@ -62,16 +63,15 @@
overflow: hidden;
}
.form-title{
color: #00883c !important;
font-size: 22px !important;text-align: left !important;
}
.btn-success{
background-color:#00883c;
/*background-color:#00883c;*/
}
.btn-success:hover, .btn-success:focus, .btn-success:active, .btn-success.active,.btn-success:active:hover, .btn-success.active:hover {
background-color:#00883c;
/*background-color:#00883c;*/
}
.login .content .form-actions .btn-success {
......
portal-web/overlays/com.cftech.workflow-module-web-1.0-SNAPSHOT/assets/adminlte/admin/login.css
View file @ 497cacd8
......@@ -35,7 +35,6 @@ Login page
}
.login .content h3 {
color: #4db3a5;
text-align: center;
font-size: 28px;
font-weight: 600 !important;
......
qy-modules/qy-orgunit-module-web/src/main/webapp/WEB-INF/views/managerorgunit/orgunitadd.html
View file @ 497cacd8
......@@ -113,19 +113,19 @@
maxlength="50" placeholder="组织名称" required="required"
value="$!{data.orgName}">
</div>
<div class="form-group form-md-line-input">
<label>组织分类</label>
<div class="input-group">
<input type="text" id="orgtypeId" name="orgtypeId" value="$!{data.orgtypeId}"
class="form-control" style="display: none">
<input type="text" id="orgtypeName" name="orgtypeName" value="$!{orgtypeName}"
class="form-control" disabled>
<span class="input-group-btn">
<button type="button" id="orgtypeSelect"
class="btn btn-info btn-flat">选择</button>
</span>
</div>
</div>
<!--<div class="form-group form-md-line-input">-->
<!--<label>组织分类</label>-->
<!--<div class="input-group">-->
<!--<input type="text" id="orgtypeId" name="orgtypeId" value="$!{data.orgtypeId}"-->
<!--class="form-control" style="display: none">-->
<!--<input type="text" id="orgtypeName" name="orgtypeName" value="$!{orgtypeName}"-->
<!--class="form-control" disabled>-->
<!--<span class="input-group-btn">-->
<!--<button type="button" id="orgtypeSelect"-->
<!--class="btn btn-info btn-flat">选择</button>-->
<!--</span>-->
<!--</div>-->
<!--</div>-->
<!--<div class="checkbox">-->
<!--<label>-->
<!--<input type="checkbox" id="isAdminUnit" name="isAdminUnit"-->
......
qy-modules/qy-orgunit-module/src/main/java/com/cftech/base/org/web/OrgUnitController.java
View file @ 497cacd8
......@@ -105,7 +105,7 @@ public class OrgUnitController {
//提交编辑页面（新增、修改）
@RequiresPermissions(value = PermissionSign.ORGUNIT_EDIT)
@RequestMapping(value = "/formData",method = {RequestMethod.POST})
@RequestMapping(value = "/formData")
@ResponseBody
public JSONObject formData(OrgUnit orgUnit, Model model, HttpServletRequest request) {
Long accountsId = Long.parseLong(qyAccounts);
......
token-module/src/main/java/com/cftech/core/util/QyTokenUtil.java
View file @ 497cacd8
......@@ -65,12 +65,13 @@ public class QyTokenUtil {
return getConfig().opsForValue().get(key);
}
// 请求企业号认证信息
String token = null;// 缓存token至redis
try {
String url = WxApiConstants.TOKEN_GET.replace("CORPID", accountsEntity.getAppid())
.replace("SECRECT", accountsEntity.getSecret());
// String retStr = OKHttpUtils.getJSON(url);
// JSONObject retObj = JSON.parseObject(retStr);
// String token = retObj.getString("access_token");// 缓存token至redis
String token = "1";// webHttpInterface.getValue(url,"access_token");
String retStr = OKHttpUtils.getJSON(url);
JSONObject retObj = JSON.parseObject(retStr);
token = retObj.getString("access_token");
getConfig().opsForValue().set(key, token);
......@@ -78,14 +79,16 @@ public class QyTokenUtil {
// 继续缓存jsticket
url = WxApiConstants.JSAPI_TICKET_GET.replace("ACCESS_TOKEN", token);
// retStr = OKHttpUtils.getJSON(url);
// retObj = JSON.parseObject(retStr);
// String jsTicket = retObj.getString("ticket");
String jsTicket = "1";// webHttpInterface.getValue(url,"ticket");
retStr = OKHttpUtils.getJSON(url);
retObj = JSON.parseObject(retStr);
String jsTicket = retObj.getString("ticket");
// 缓存token至redis
getConfig().opsForValue().set(jskey, jsTicket);
getConfig().expire(jskey, 6000, TimeUnit.SECONDS);
} catch (IOException e) {
e.printStackTrace();
}
return token;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment