Skip to content

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

init aidea products by 20200922

parent d65c82f6
Show whitespace changes
Inline Side-by-side
Showing with 447 additions and 437 deletions
aidea-modules/consult-module/target/classes/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @ ac37690f
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cftech.consultSheet.dao.ConsultSheetMapper"> <mapper namespace="com.cftech.consultsheet.dao.ConsultSheetMapper">
<resultMap id="resultMap" type="com.cftech.consultSheet.model.ConsultSheet"> <resultMap id="resultMap" type="com.cftech.consultsheet.model.ConsultSheet">
<id column="id" property="id"/> <id column="id" property="id"/>
<result column="consult_id" property="consultId"/> <result column="consult_id" property="consultId"/>
<result column="user_name" property="userName"/> <result column="user_name" property="userName"/>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</sql> </sql>
<insert id="save" parameterType="com.cftech.consultSheet.model.ConsultSheet" useGeneratedKeys="true" <insert id="save" parameterType="com.cftech.consultsheet.model.ConsultSheet" useGeneratedKeys="true"
keyProperty="id"> keyProperty="id">
insert into t_aidea_consult_sheet insert into t_aidea_consult_sheet
( (
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<if test="limit>0">limit #{offset},#{limit}</if> <if test="limit>0">limit #{offset},#{limit}</if>
</select> </select>
<update id="update" parameterType="com.cftech.consultSheet.model.ConsultSheet"> <update id="update" parameterType="com.cftech.consultsheet.model.ConsultSheet">
update t_aidea_consult_sheet update t_aidea_consult_sheet
<set> <set>
<if test="id != null"> <if test="id != null">
......
cftech-common-web/src/main/resources/common-test.properties
View file @ ac37690f
...@@ -39,8 +39,8 @@ WOEK_TEMPLATE_MESSAGE=8m-_tt_EqoQO-wsE6_JLJdn3nO15_hgUp9mLTujz5RU ...@@ -39,8 +39,8 @@ WOEK_TEMPLATE_MESSAGE=8m-_tt_EqoQO-wsE6_JLJdn3nO15_hgUp9mLTujz5RU
userfiles.imgdir=E:\\fileResource userfiles.imgdir=E:\\fileResource
#\u56FE\u7247\u8BBF\u95EE\u5730\u5740 #\u56FE\u7247\u8BBF\u95EE\u5730\u5740
IMAGEURL=/schaeffler/mobile/qybase/showPic?picFileName={PICFILENAME} ROOT_ORG_NAME=\u827E\u8FEA\u836F\u4E1A
ROOT_ORG_NAME=\u4E1C\u660C\u96C6\u56E2 IMAGEURL=/aidea/mobile/qybase/showPic?picFileName={PICFILENAME}
ROOT_PAPERCATEGORY_NAME=\u95EE\u5377\u7C7B\u578B ROOT_PAPERCATEGORY_NAME=\u95EE\u5377\u7C7B\u578B
ROOT_QUESTIONSCATEGORY_NAME=\u95EE\u9898\u7C7B\u522B ROOT_QUESTIONSCATEGORY_NAME=\u95EE\u9898\u7C7B\u522B
ROOT_MATERIALCATEGORY_NAME=\u7D20\u6750\u7C7B\u522B ROOT_MATERIALCATEGORY_NAME=\u7D20\u6750\u7C7B\u522B
...@@ -106,7 +106,7 @@ orderDeliverGoodsTemplateId=TH3I5prFYPC54M14zFJfgN4gvjx8SpJayctIHmzThwg ...@@ -106,7 +106,7 @@ orderDeliverGoodsTemplateId=TH3I5prFYPC54M14zFJfgN4gvjx8SpJayctIHmzThwg
#\u670D\u52A1\u5B8C\u6210\u901A\u77E5 #\u670D\u52A1\u5B8C\u6210\u901A\u77E5
serverEndTemplateId=7L1KIroXNxejxotFTzll-dVLdo1xbmqoiAo7UmDKWcc serverEndTemplateId=7L1KIroXNxejxotFTzll-dVLdo1xbmqoiAo7UmDKWcc
PRODUCT_CLASSIFY_FATHER_NAME=Ʒ PRODUCT_CLASSIFY_FATHER_NAME=\uFFFD\uFFFD\u01B7\uFFFD\uFFFD\uFFFD\uFFFD
#\u54C1\u724C\u7533\u8BF7\u6D88\u606F\u6A21\u677F #\u54C1\u724C\u7533\u8BF7\u6D88\u606F\u6A21\u677F
brandApplyCommTemplateId=82ByH2tkWI1-jlYiWr_-CIihWsgjrvLdFvuO771FwBo brandApplyCommTemplateId=82ByH2tkWI1-jlYiWr_-CIihWsgjrvLdFvuO771FwBo
......
cftech-common-web/src/main/webapp/assets/adminlte/plugins/ueditor-min-1.4.3/ueditor.config.js
View file @ ac37690f
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
*/ */
//var URL = base + '/ueditor-min-1.4.3/'; //var URL = base + '/ueditor-min-1.4.3/';
//var URL = 'plugins/ueditor-min-1.4.3/'; //var URL = 'plugins/ueditor-min-1.4.3/';
var URL = '/schaeffler/assets/adminlte/plugins/ueditor-min-1.4.3/'; var URL = '/aidea/assets/adminlte/plugins/ueditor-min-1.4.3/';
/** /**
* 配置项主体。注意，此处所有涉及到路径的配置别遗漏URL变量。 * 配置项主体。注意，此处所有涉及到路径的配置别遗漏URL变量。
......
cos-modules/cos-upload-module-web/src/main/webapp/WEB-INF/views/upload/materialUploadform.html
View file @ ac37690f
...@@ -242,6 +242,9 @@ ...@@ -242,6 +242,9 @@
#if($cosconfig.cosType == "qiniu") #if($cosconfig.cosType == "qiniu")
<option value="$cosconfig.id">七牛</option> <option value="$cosconfig.id">七牛</option>
#end #end
#if($cosconfig.cosType == "local")
<option value="$cosconfig.id">本地</option>
#end
#end #end
</select> </select>
</div> </div>
......
portal-web/pom.xml
View file @ ac37690f
...@@ -238,6 +238,12 @@ ...@@ -238,6 +238,12 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency>
<groupId>com.cftech</groupId>
<artifactId>product-classify-module-web</artifactId>
<version>1.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<!--<dependency> <!--<dependency>
<groupId>com.cftech</groupId> <groupId>com.cftech</groupId>
<artifactId>fours-job-module</artifactId> <artifactId>fours-job-module</artifactId>
......
portal-web/src/main/webapp/WEB-INF/web.xml
View file @ ac37690f
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<context-param> <context-param>
<param-name>webAppRootKey</param-name> <param-name>webAppRootKey</param-name>
<param-value>schaeffler</param-value> <param-value>aidea</param-value>
</context-param> </context-param>
<listener> <listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
......
qy-modules/qy-orgunit-module-web/src/main/webapp/WEB-INF/views/managerorgunit/orgunitadd.html
View file @ ac37690f
...@@ -112,19 +112,19 @@ ...@@ -112,19 +112,19 @@
maxlength="50" placeholder="组织名称" required="required" maxlength="50" placeholder="组织名称" required="required"
value="$!{data.orgName}"> value="$!{data.orgName}">
</div> </div>
<div class="form-group form-md-line-input"> <!--<div class="form-group form-md-line-input">-->
<label>组织分类</label> <!--<label>组织分类</label>-->
<div class="input-group"> <!--<div class="input-group">-->
<input type="text" id="orgtypeId" name="orgtypeId" value="$!{data.orgtypeId}" <!--<input type="text" id="orgtypeId" name="orgtypeId" value="$!{data.orgtypeId}"-->
class="form-control" style="display: none"> <!--class="form-control" style="display: none">-->
<input type="text" id="orgtypeName" name="orgtypeName" value="$!{orgtypeName}" <!--<input type="text" id="orgtypeName" name="orgtypeName" value="$!{orgtypeName}"-->
class="form-control" disabled> <!--class="form-control" disabled>-->
<span class="input-group-btn"> <!--<span class="input-group-btn">-->
<button type="button" id="orgtypeSelect" <!--<button type="button" id="orgtypeSelect"-->
class="btn btn-info btn-flat">选择</button> <!--class="btn btn-info btn-flat">选择</button>-->
</span> <!--</span>-->
</div> <!--</div>-->
</div> <!--</div>-->
<!--<div class="checkbox">--> <!--<div class="checkbox">-->
<!--<label>--> <!--<label>-->
<!--<input type="checkbox" id="isAdminUnit" name="isAdminUnit"--> <!--<input type="checkbox" id="isAdminUnit" name="isAdminUnit"-->
......
qy-modules/qy-orgunit-module/src/main/java/com/cftech/base/org/web/OrgUnitController.java
View file @ ac37690f
...@@ -105,7 +105,7 @@ public class OrgUnitController { ...@@ -105,7 +105,7 @@ public class OrgUnitController {
//提交编辑页面（新增、修改） //提交编辑页面（新增、修改）
@RequiresPermissions(value = PermissionSign.ORGUNIT_EDIT) @RequiresPermissions(value = PermissionSign.ORGUNIT_EDIT)
@RequestMapping(value = "/formData",method = {RequestMethod.POST}) @RequestMapping(value = "/formData")
@ResponseBody @ResponseBody
public JSONObject formData(OrgUnit orgUnit, Model model, HttpServletRequest request) { public JSONObject formData(OrgUnit orgUnit, Model model, HttpServletRequest request) {
Long accountsId = UserUtils.getmpaccounts(request); Long accountsId = UserUtils.getmpaccounts(request);
...@@ -123,20 +123,20 @@ public class OrgUnitController { ...@@ -123,20 +123,20 @@ public class OrgUnitController {
orgUnit.setParentIds("0," + orgUnit.getId() + ","); orgUnit.setParentIds("0," + orgUnit.getId() + ",");
} }
// 2017-10-27 取消同步企业号，组织功能 //同步至企业号
// if (StringUtils.isEmpty(orgUnit.getWxorgId())) { if (StringUtils.isEmpty(orgUnit.getWxorgId())) {
// int wxorgid = qyOrgUtil.create(orgUnit, parentOrgUnit); int wxorgid = qyOrgUtil.create(orgUnit, parentOrgUnit);
// if (wxorgid == -1) { if (wxorgid == -1) {
// log.error("同步微信端出错," + orgUnit.toString()); log.error("同步微信端出错," + orgUnit.toString());
// } else { } else {
// orgUnit.setWxorgId("" + wxorgid); orgUnit.setWxorgId("" + wxorgid);
//
// } }
// } else { } else {
// if (!qyOrgUtil.update(orgUnit)) { if (!qyOrgUtil.update(orgUnit)) {
// log.error("同步微信端出错," + orgUnit.toString()); log.error("同步微信端出错," + orgUnit.toString());
// } }
// } }
orgUnitService.updateCache(orgUnit); orgUnitService.updateCache(orgUnit);
rtnJson.put("errorNo", 0); rtnJson.put("errorNo", 0);
...@@ -157,14 +157,13 @@ public class OrgUnitController { ...@@ -157,14 +157,13 @@ public class OrgUnitController {
orgUnit.setUpdateBy(UserUtils.getUser().getId()); orgUnit.setUpdateBy(UserUtils.getUser().getId());
orgUnitService.saveCache(orgUnit); orgUnitService.saveCache(orgUnit);
// 2017-10-27 取消同步企业号，组织功能 int wxorgid = qyOrgUtil.create(orgUnit, parentOrgUnit);
// int wxorgid = qyOrgUtil.create(orgUnit, parentOrgUnit); if (wxorgid == -1 || wxorgid == 0) {
// if (wxorgid == -1 || wxorgid == 0) { rtnJson.put("errorNo", 1);
// rtnJson.put("errorNo", 1); throw new Exception("同步微信端出错");
// throw new Exception("同步微信端出错"); } else {
// } else { orgUnit.setWxorgId("" + wxorgid);
// orgUnit.setWxorgId("" + wxorgid); }
// }
orgUnit.setParentIds(orgUnit.getParentIds() + orgUnit.getId() + ","); orgUnit.setParentIds(orgUnit.getParentIds() + orgUnit.getId() + ",");
orgUnitService.updateCache(orgUnit); orgUnitService.updateCache(orgUnit);
......
token-module/src/main/java/com/cftech/core/util/QyTokenUtil.java
View file @ ac37690f
...@@ -23,8 +23,8 @@ import java.util.concurrent.TimeUnit; ...@@ -23,8 +23,8 @@ import java.util.concurrent.TimeUnit;
/** /**
* 企业号 ACCESS TOKEN 管理 * 企业号 ACCESS TOKEN 管理
* @author Neil
* *
* @author Neil
*/ */
@Slf4j @Slf4j
@Component @Component
...@@ -35,8 +35,6 @@ public class QyTokenUtil { ...@@ -35,8 +35,6 @@ public class QyTokenUtil {
@Autowired @Autowired
private RedisTemplate<String, String> redisTemplate; private RedisTemplate<String, String> redisTemplate;
// @Autowired
// private WebHttpInterface webHttpInterface;
private RedisTemplate<String, String> getConfig() { private RedisTemplate<String, String> getConfig() {
StringRedisSerializer stringSerializer = new StringRedisSerializer(); StringRedisSerializer stringSerializer = new StringRedisSerializer();
...@@ -46,9 +44,10 @@ public class QyTokenUtil { ...@@ -46,9 +44,10 @@ public class QyTokenUtil {
redisTemplate.setHashValueSerializer(stringSerializer); redisTemplate.setHashValueSerializer(stringSerializer);
return redisTemplate; return redisTemplate;
} }
/** /**
*
* 通过企业号corpid刷新最新的token，并返回 * 通过企业号corpid刷新最新的token，并返回
*
* @return * @return
*/ */
public String getToken(Long accountId)//更新token public String getToken(Long accountId)//更新token
...@@ -64,13 +63,14 @@ public class QyTokenUtil { ...@@ -64,13 +63,14 @@ public class QyTokenUtil {
if (getConfig().hasKey(key)) { if (getConfig().hasKey(key)) {
return getConfig().opsForValue().get(key); return getConfig().opsForValue().get(key);
} }
String token = null;
try {
// 请求企业号认证信息 // 请求企业号认证信息
String url = WxApiConstants.TOKEN_GET.replace("CORPID", accountsEntity.getAppid()) String url = WxApiConstants.TOKEN_GET.replace("CORPID", accountsEntity.getAppid())
.replace("SECRECT", accountsEntity.getSecret()); .replace("SECRECT", accountsEntity.getSecret());
// String retStr = OKHttpUtils.getJSON(url); String retStr = OKHttpUtils.getJSON(url);
// JSONObject retObj = JSON.parseObject(retStr); JSONObject retObj = JSON.parseObject(retStr);
// String token = retObj.getString("access_token");// 缓存token至redis token = retObj.getString("access_token");// 缓存token至redis
String token = "1";// webHttpInterface.getValue(url,"access_token");
getConfig().opsForValue().set(key, token); getConfig().opsForValue().set(key, token);
...@@ -78,14 +78,16 @@ public class QyTokenUtil { ...@@ -78,14 +78,16 @@ public class QyTokenUtil {
// 继续缓存jsticket // 继续缓存jsticket
url = WxApiConstants.JSAPI_TICKET_GET.replace("ACCESS_TOKEN", token); url = WxApiConstants.JSAPI_TICKET_GET.replace("ACCESS_TOKEN", token);
// retStr = OKHttpUtils.getJSON(url); retStr = OKHttpUtils.getJSON(url);
// retObj = JSON.parseObject(retStr); retObj = JSON.parseObject(retStr);
// String jsTicket = retObj.getString("ticket"); String jsTicket = retObj.getString("ticket");
String jsTicket = "1";// webHttpInterface.getValue(url,"ticket");
// 缓存token至redis // 缓存token至redis
getConfig().opsForValue().set(jskey, jsTicket); getConfig().opsForValue().set(jskey, jsTicket);
getConfig().expire(jskey, 6000, TimeUnit.SECONDS); getConfig().expire(jskey, 6000, TimeUnit.SECONDS);
} catch (IOException e) {
e.printStackTrace();
}
return token; return token;
} }
...@@ -144,7 +146,7 @@ public class QyTokenUtil { ...@@ -144,7 +146,7 @@ public class QyTokenUtil {
/** /**
* 通过主键ID，获取公众号实体 * 通过主键ID，获取公众号实体
*/ */
public MpAccountsEntity searchAccountsById(Long id){ public MpAccountsEntity searchAccountsById(Long id) {
MpAccountsEntity accountsEntity = accountService.getDetail(id); MpAccountsEntity accountsEntity = accountService.getDetail(id);
return accountsEntity; return accountsEntity;
} }
...@@ -152,7 +154,7 @@ public class QyTokenUtil { ...@@ -152,7 +154,7 @@ public class QyTokenUtil {
/** /**
* 通过appid,获取公众号实体 * 通过appid,获取公众号实体
*/ */
public MpAccountsEntity searchAccounts(String appid){ public MpAccountsEntity searchAccounts(String appid) {
MpAccountsEntity accountsEntity = accountService.getMpAccountsAppid(appid); MpAccountsEntity accountsEntity = accountService.getMpAccountsAppid(appid);
return accountsEntity; return accountsEntity;
} }
......
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