Skip to content

Commit

Permalink
update: 乱七八糟的一堆未提交的小代码.
Browse files Browse the repository at this point in the history
Signed-off-by: wendal chen <wendal1985@gmail.com>
  • Loading branch information
wendal committed Aug 4, 2016
1 parent c0e4e1c commit a1b0768
Show file tree
Hide file tree
Showing 18 changed files with 887 additions and 79 deletions.
8 changes: 4 additions & 4 deletions INSTALL_NEW.md
Expand Up @@ -116,10 +116,10 @@ redis-server /etc/redis.conf &

```
cd /opt/
wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.tar.gz"
tar xzf jdk-8u66-linux-x64.tar.gz
ln -s /opt/jdk1.8.0_66 /opt/jdk
rm jdk-8u66-linux-x64.tar.gz
wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-linux-x64.tar.gz"
tar xzf jdk-8u102-linux-x64.tar.gz
ln -s /opt/jdk1.8.0_102 /opt/jdk
rm jdk-8u102-linux-x64.tar.gz
```

## 安装maven
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2015 Wendal<wendal1985@gmail.com>
Copyright 2015-2016 Wendal<wendal1985@gmail.com>

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
18 changes: 10 additions & 8 deletions pom.xml
Expand Up @@ -44,6 +44,7 @@
<compilerArgs>
<arg>-parameters</arg>
</compilerArgs>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -247,7 +248,7 @@
<dependency>
<groupId>org.nutz</groupId>
<artifactId>nutz-plugins-views</artifactId>
<version>1.r.54.r2</version>
<version>1.r.57</version>
<exclusions>
<exclusion>
<groupId>org.nutz</groupId>
Expand Down Expand Up @@ -320,7 +321,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.0.19</version>
<version>1.0.23</version>
<exclusions>
<exclusion>
<artifactId>jconsole</artifactId>
Expand Down Expand Up @@ -398,11 +399,6 @@
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>javax.websocket</groupId>
<artifactId>javax.websocket-api</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.nutz</groupId>
<artifactId>nutzwx</artifactId>
Expand Down Expand Up @@ -463,12 +459,18 @@
<dependency>
<groupId>org.nutz</groupId>
<artifactId>nutz</artifactId>
<version>1.r.57</version>
<version>1.r.57.r3</version>
</dependency>
<dependency>
<groupId>org.nutz</groupId>
<artifactId>nutz-integration-dubbo</artifactId>
<version>1.r.58-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.nutz</groupId>
<artifactId>nutz</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/net/wendal/nutzbook/MainModule.java
Expand Up @@ -22,7 +22,7 @@
"*async",
"*tx",
"*org.nutz.plugins.view.freemarker.FreemarkerIocLoader",
"*dubbo", "dubbo-server.xml"
"*dubbo", "dubbo-server.xml" // 配置dubbo
})
@Modules(scanPackage=true)
@ChainBy(args="mvc/nutzbook-mvc-chain.js")
Expand All @@ -31,5 +31,4 @@
@Localization(value="msg/", defaultLocalizationKey="zh-CN")
@Views({BeetlViewMaker2.class,FreemarkerViewMaker.class})
@SessionBy(ShiroSessionProvider.class)
public class MainModule {
}
public class MainModule {}
4 changes: 2 additions & 2 deletions src/main/java/net/wendal/nutzbook/MainSetup.java
Expand Up @@ -9,6 +9,7 @@
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.Daos;
import org.nutz.integration.dubbo.DubboManager;
import org.nutz.integration.quartz.NutQuartzCronJobFactory;
import org.nutz.integration.shiro.NutShiro;
import org.nutz.ioc.Ioc;
Expand All @@ -34,7 +35,6 @@
import net.wendal.nutzbook.bean.yvr.TopicReply;
import net.wendal.nutzbook.service.AuthorityService;
import net.wendal.nutzbook.service.BigContentService;
import net.wendal.nutzbook.service.DubboWayService;
import net.wendal.nutzbook.service.UserService;
import net.wendal.nutzbook.service.syslog.SysLogService;
import net.wendal.nutzbook.service.yvr.YvrService;
Expand Down Expand Up @@ -148,7 +148,7 @@ public void init(NutConfig nc) {
// 初始化Dubbo服务

try {
ioc.get(null, DubboWayService.class.getName());
ioc.get(DubboManager.class);
}
catch (Exception e) {
log.debug("dubbo error", e);
Expand Down
103 changes: 103 additions & 0 deletions src/main/java/net/wendal/nutzbook/module/DemoModule.java
@@ -0,0 +1,103 @@
package net.wendal.nutzbook.module;

import java.io.File;
import java.io.IOException;
import java.util.Date;
import java.util.List;

import javax.servlet.http.HttpServletRequest;

import org.nutz.json.Json;
import org.nutz.lang.util.NutMap;
import org.nutz.mvc.adaptor.JsonAdaptor;
import org.nutz.mvc.adaptor.WhaleAdaptor;
import org.nutz.mvc.annotation.AdaptBy;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import org.nutz.mvc.upload.TempFile;
import org.nutz.mvc.upload.UploadAdaptor;
import org.nutz.mvc.upload.Uploads;

import net.wendal.nutzbook.bean.User;

@At("/demo")
public class DemoModule {

@At("/param/mydate")
public void mydate(@Param("..")P p) {
System.out.println(Json.toJson(p));
}

public static class P {
public Date mydate;
}

@At
@AdaptBy(type=UploadAdaptor.class)
public void upload(@Param("file")TempFile tmp, @Param("file")List<TempFile> files,
@Param("file")List<File> files2) throws IOException{
System.out.println(tmp.getFile().getAbsolutePath());
//if (tmp != null)
// tmp.delete();
System.out.println(tmp);
System.out.println(files);
System.out.println(files.get(0));
System.out.println(files2);
}

@At
@Ok("json")
public Object uploadp(HttpServletRequest req) {
return Uploads.getInfo(req);
}

@Ok("json")
@At("/whale/test")
@AdaptBy(type=WhaleAdaptor.class)
public Object whaleInput(@Param("lines")String[] lines) {
return lines;
}

@AdaptBy(type=JsonAdaptor.class)
@At("/pathjson/**")
public void pathjson(NutMap map) {
System.out.println(Json.toJson(map));
}

@At("/get/?/?/?")
@Ok("json")
public void get(String host,String startTime,String endTime) {

}

@At("/url")
@Ok("json")
public void url(String url) {
System.out.println(url);
}

@At("/play/mp3")
@Ok("raw")
public File play_mp3() {
return new File("D:\\05472810ed6b26f5c90cc02d41e08865.mp3");
}

@At("/dw/mp3")
@Ok("raw")
public File download_mp3() {
return new File("D:\\05472810ed6b26f5c90cc02d41e08865.mp3");
}

@At(value="/notfound",top=false)
@Ok("raw")
public String notfound() {
return "404了啊啊啊";
}

@At("/param/list")
@Ok("json:forlook")
public Object paramList(@Param("::user")List<User> users) {
return users;
}
}
Expand Up @@ -77,7 +77,7 @@ public String msg(@Param("..") NutMap data, HttpServletRequest req)
String route = conf.get("qqbot.route."+groupId);
if (!Strings.isBlank(route)) {
if (!route.startsWith("http"))
route = "http://" + route + "/robot/msg";
route = "https://" + route + "/robot/msg";
log.debug("route to " + route);
Request _req = Request.create(route, METHOD.POST, data);
Response resp = Sender.create(_req).setTimeout(5*1000).send();
Expand Down Expand Up @@ -112,21 +112,21 @@ public String msg(@Param("..") NutMap data, HttpServletRequest req)

List<LuceneSearchResult> results = topicSearchService.search(key, true, 3);
if (results == null || results.size() == 0) {
return at + " 发帖问问吧 http://" + req.getHeader("Host") + "/yvr/add";
return at + " 发帖问问吧 https://" + req.getHeader("Host") + "/yvr/add";
}
final StringBuilder msgbBuilder = new StringBuilder();
for (LuceneSearchResult result : results) {
Topic topic = dao.fetch(Topic.class, result.getId());
if (topic == null)
continue;
topic.setTitle(result.getResult());
String text = String.format("%s http://%s/yvr/t/%s\r\n",
String text = String.format("%s https://%s/yvr/t/%s\r\n",
topic.getTitle(),
req.getHeader("Host"),
topic.getId().substring(0, 6));
msgbBuilder.append(text);
}
msgbBuilder.append(String.format("完整结果: http://%s/yvr/search?q=%s", req.getHeader("Host"), URLEncoder.encode(key, Encoding.UTF8)));
msgbBuilder.append(String.format("完整结果: https://%s/yvr/search?q=%s", req.getHeader("Host"), URLEncoder.encode(key, Encoding.UTF8)));
return msgbBuilder.toString();
}

Expand Down
Expand Up @@ -29,7 +29,7 @@ public List<PermissionCategory> getList() {
return list;
}

public void insert(PermissionCategory pc) {
dao().insert(pc);
public PermissionCategory insert(PermissionCategory pc) {
return dao().insert(pc);
}
}
Expand Up @@ -43,16 +43,16 @@ public Map<Long, String> map() {
return map;
}

public void insert(Permission permission) {
dao().insert(permission);
public Permission insert(Permission permission) {
return dao().insert(permission);
}

public Permission view(Long id) {
return fetch(id);
}

public void update(Permission permission) {
dao().update(permission);
public int update(Permission permission) {
return dao().update(permission);
}

public Pagination getListByPager(Integer pageNumber) {
Expand Down
96 changes: 48 additions & 48 deletions src/main/java/net/wendal/nutzbook/service/RoleService.java
@@ -1,48 +1,48 @@
package net.wendal.nutzbook.service;

import java.util.List;

import net.wendal.nutzbook.bean.Role;
import net.wendal.nutzbook.page.Pagination;

import org.nutz.dao.FieldFilter;
import org.nutz.dao.FieldMatcher;
import org.nutz.dao.pager.Pager;
import org.nutz.dao.util.Daos;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.Lang;
import org.nutz.service.IdNameEntityService;

@IocBean(fields = "dao")
public class RoleService extends IdNameEntityService<Role> {

public Pagination getListByPager(int pageNumber) {
Pager pager = dao().createPager(pageNumber, 20);
List<Role> list = dao().query(getEntityClass(), null, pager);
pager.setRecordCount(dao().count(getEntityClass(), null));
return new Pagination(pageNumber, 20, pager.getRecordCount(), list);
}

public List<Role> roleList() {
return dao().query(getEntityClass(), null);
}

public void insert(Role role) {
dao().insert(role);
}

public void update(Role role) {
FieldFilter filter = FieldFilter.create(getEntityClass(), FieldMatcher.make(null, "^(createTime|updateTime)$", true));
Daos.ext(dao(), filter).update(role);
}

public void updateRoleRelation(Role role, List<net.wendal.nutzbook.bean.Permission> perms) {
dao().clearLinks(role, "permissions");
role.getPermissions().clear();
dao().update(role);
if (!Lang.isEmpty(perms)) {
role.setPermissions(perms);
dao().insertRelation(role, "permissions");
}
}
}
package net.wendal.nutzbook.service;

import java.util.List;

import net.wendal.nutzbook.bean.Role;
import net.wendal.nutzbook.page.Pagination;

import org.nutz.dao.FieldFilter;
import org.nutz.dao.FieldMatcher;
import org.nutz.dao.pager.Pager;
import org.nutz.dao.util.Daos;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.Lang;
import org.nutz.service.IdNameEntityService;

@IocBean(fields = "dao")
public class RoleService extends IdNameEntityService<Role> {

public Pagination getListByPager(int pageNumber) {
Pager pager = dao().createPager(pageNumber, 20);
List<Role> list = dao().query(getEntityClass(), null, pager);
pager.setRecordCount(dao().count(getEntityClass(), null));
return new Pagination(pageNumber, 20, pager.getRecordCount(), list);
}

public List<Role> roleList() {
return dao().query(getEntityClass(), null);
}

public Role insert(Role role) {
return dao().insert(role);
}

public int update(Role role) {
FieldFilter filter = FieldFilter.create(getEntityClass(), FieldMatcher.make(null, "^(createTime|updateTime)$", true));
return Daos.ext(dao(), filter).update(role);
}

public void updateRoleRelation(Role role, List<net.wendal.nutzbook.bean.Permission> perms) {
dao().clearLinks(role, "permissions");
role.getPermissions().clear();
dao().update(role);
if (!Lang.isEmpty(perms)) {
role.setPermissions(perms);
dao().insertRelation(role, "permissions");
}
}
}

0 comments on commit a1b0768

Please sign in to comment.